From 341866881133f28d6e43bdad62bc02d79b17c22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Sch=C3=B6nheit?= <fs@openoffice.org>
Date: Thu, 19 Apr 2001 06:14:49 +0000
Subject: [PATCH] throwFunctionSequenceException instead of throw
 FunctionSequenceException (bridge problems)

---
 dbaccess/source/core/api/RowSet.cxx         | 98 ++++++++++-----------
 dbaccess/source/core/api/RowSetBase.cxx     | 92 +++++++++----------
 dbaccess/source/core/api/RowSetCache.cxx    | 87 +++++++++---------
 dbaccess/source/core/api/resultset.cxx      | 62 ++++++-------
 dbaccess/source/core/api/statement.cxx      | 16 ++--
 dbaccess/source/core/api/table.cxx          |  6 +-
 dbaccess/source/core/api/tablecontainer.cxx | 20 ++---
 dbaccess/source/core/api/viewcontainer.cxx  |  8 +-
 8 files changed, 196 insertions(+), 193 deletions(-)

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index fc0bd44441b6..1f6f5d45257a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.cxx,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-18 12:46:58 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -773,7 +773,7 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, R
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -791,7 +791,7 @@ void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -811,7 +811,7 @@ void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQL
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -829,7 +829,7 @@ void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(S
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -848,7 +848,7 @@ void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQL
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -866,7 +866,7 @@ void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQ
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -884,7 +884,7 @@ void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLEx
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -902,7 +902,7 @@ void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQL
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -920,7 +920,7 @@ void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const ::rtl::OUStrin
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -939,7 +939,7 @@ void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_I
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -957,7 +957,7 @@ void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -975,7 +975,7 @@ void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -993,7 +993,7 @@ void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun:
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -1011,7 +1011,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || !x.is() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -1029,7 +1029,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || !x.is() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -1047,7 +1047,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -1065,7 +1065,7 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x,
         throw DisposedException();
 
     if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     checkUpdateIterator();
@@ -1088,7 +1088,7 @@ void SAL_CALL ORowSet::insertRow(  ) throw(SQLException, RuntimeException)
     // when the row isn't modified
     // or the concurency is read only
     if(!m_pCache || !m_bNew || !m_bModified || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -1128,7 +1128,7 @@ sal_Int32 SAL_CALL ORowSet::getRow(  ) throw(SQLException, RuntimeException)
     if (ORowSet_BASE1::rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_aRowCountMutex );
     // check if we are inserting a row
@@ -1143,7 +1143,7 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
     // not allowed when standing on insert row
     if(!m_pCache || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY || m_bNew)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -1186,7 +1186,7 @@ void SAL_CALL ORowSet::deleteRow(  ) throw(SQLException, RuntimeException)
     // stands on the insert row
     // the concurrency is read only
     if(!m_pCache || m_bBeforeFirst || m_bAfterLast || m_bNew || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
 
     // this call position the cache indirect
@@ -1226,7 +1226,7 @@ void SAL_CALL ORowSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException
     // standing on the insert row
     // the concurrency is read only
     if(!m_pCache || m_bNew || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -1335,7 +1335,7 @@ void SAL_CALL ORowSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
@@ -1367,7 +1367,7 @@ void SAL_CALL ORowSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
@@ -1392,7 +1392,7 @@ sal_Bool SAL_CALL ORowSet::wasNull(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
@@ -1407,7 +1407,7 @@ sal_Bool SAL_CALL ORowSet::wasNull(  ) throw(SQLException, RuntimeException)
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1422,7 +1422,7 @@ sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex ) throw(SQLExceptio
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1437,7 +1437,7 @@ sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex ) throw(SQLException,
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1452,7 +1452,7 @@ sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex ) throw(SQLException
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1467,7 +1467,7 @@ sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex ) throw(SQLException,
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1482,7 +1482,7 @@ sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex ) throw(SQLException,
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1497,7 +1497,7 @@ float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, Ru
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1512,7 +1512,7 @@ double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex ) throw(SQLException,
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1527,7 +1527,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(S
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1542,7 +1542,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(S
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1557,7 +1557,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(S
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1572,7 +1572,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(S
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return (*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex];
     }
 
@@ -1587,7 +1587,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStrea
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return new ::comphelper::SequenceInputStream((*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex].getSequence());
     }
 
@@ -1602,7 +1602,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getCharacterSt
         if (ORowSet_BASE1::rBHelper.bDisposed)
             throw DisposedException();
         if(!m_pCache)
-            throw FunctionSequenceException(*m_pMySelf);
+            throwFunctionSequenceException(*m_pMySelf);
         return new ::comphelper::SequenceInputStream((*(*m_pCache->m_aInsertRow))[m_nLastColumnIndex = columnIndex].getSequence());
     }
 
@@ -1614,7 +1614,7 @@ Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAc
     if (ORowSet_BASE1::rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Any();
 }
@@ -1624,7 +1624,7 @@ Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 columnIndex ) throw(SQLExc
     if (ORowSet_BASE1::rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XRef >();
 }
@@ -1634,7 +1634,7 @@ Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLE
     if (ORowSet_BASE1::rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XBlob >();
 }
@@ -1645,7 +1645,7 @@ Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) throw(SQLE
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XClob >();
 }
@@ -1656,7 +1656,7 @@ Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 columnIndex ) throw(SQ
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XArray >();
 }
@@ -1825,7 +1825,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ClearableMutexGuard& _rClearForNotific
         // xTables will be filled in getCommand
         m_aActiveCommand = getCommand(bUseEscapeProcessing,xTables);
         if (!m_aActiveCommand.len())
-            throw FunctionSequenceException(*this);
+            throwFunctionSequenceException(*this);
 
         {
             m_xStatement = m_xActiveConnection->prepareStatement(
@@ -2037,7 +2037,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ClearableMutexGuard& _rClearForNotific
         }
     }
     if(!m_pCache)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
     _rClearForNotification.clear();
     // notify the rowset listeners
     notifyAllListeners();
@@ -2099,7 +2099,7 @@ Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index a2e64204f448..9d4e35a49fb0 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetBase.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-06 10:19:13 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -245,7 +245,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return (m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True;
 }
@@ -255,7 +255,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -268,7 +268,7 @@ sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLExce
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
     return sal_False;
@@ -279,7 +279,7 @@ sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLExcepti
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -292,7 +292,7 @@ sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLExcep
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -304,7 +304,7 @@ sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLExcepti
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -316,7 +316,7 @@ sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLExcept
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -328,7 +328,7 @@ float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -340,7 +340,7 @@ double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLExcepti
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -352,7 +352,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) thr
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -365,7 +365,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) thr
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -378,7 +378,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) thr
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -390,7 +390,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) thr
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
@@ -403,7 +403,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return new ::comphelper::SequenceInputStream((*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex].getSequence());
@@ -416,7 +416,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getCharact
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
         return new ::comphelper::SequenceInputStream((*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex].getSequence());
@@ -428,7 +428,7 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Any();
 }
@@ -438,7 +438,7 @@ Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 columnIndex ) throw(SQ
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XRef >();
 }
@@ -448,7 +448,7 @@ Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XBlob >();
 }
@@ -459,7 +459,7 @@ Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XClob >();
 }
@@ -470,7 +470,7 @@ Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 columnIndex ) thro
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return Reference< XArray >();
 }
@@ -482,7 +482,7 @@ Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache || m_bBeforeFirst || m_bAfterLast)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
@@ -493,12 +493,12 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
 {
     OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!");
     if(!bookmark.hasValue() || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
     if (m_rBHelper.bDisposed)
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -539,7 +539,7 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -590,7 +590,7 @@ sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& first, const Any& s
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
     return m_pCache->compareBookmarks(first,second);
 }
 // -------------------------------------------------------------------------
@@ -600,7 +600,7 @@ sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, Runti
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
     return m_pCache->hasOrderedBookmarks();
 }
 // -------------------------------------------------------------------------
@@ -610,7 +610,7 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
     return m_pCache->hashBookmark(bookmark);
 }
 // -------------------------------------------------------------------------
@@ -660,7 +660,7 @@ sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -713,7 +713,7 @@ sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeExce
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 //  if(m_aBookmark.hasValue())
 //      m_pCache->moveToBookmark(m_aBookmark);
     return m_bBeforeFirst;
@@ -725,7 +725,7 @@ sal_Bool SAL_CALL ORowSetBase::isAfterLast(  ) throw(SQLException, RuntimeExcept
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     return m_bAfterLast;
     //  return m_aCurrentRow == m_pCache->getEnd();
@@ -741,7 +741,7 @@ sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_bBeforeFirst || m_bAfterLast) // so we can't be on the first
         return sal_False;
@@ -760,7 +760,7 @@ sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_bBeforeFirst || m_bAfterLast) // so we can't be on the last
         return sal_False;
@@ -777,7 +777,7 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -805,7 +805,7 @@ void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     if(notifyAllListenersCursorBeforeMove())
@@ -832,7 +832,7 @@ sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -884,7 +884,7 @@ sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     sal_Bool bRet;
@@ -937,7 +937,7 @@ sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException)
     if (m_rBHelper.bDisposed)
         throw DisposedException();
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_bAfterLast || m_bBeforeFirst) // we are on no valid row
         return 0;
@@ -962,7 +962,7 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if((m_bAfterLast && row > 1))
         return sal_False;// we are already behind the last row
@@ -1021,7 +1021,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
         return sal_True; // in this case do nothing
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if((m_bAfterLast && rows > 1) || (m_bBeforeFirst && rows < 0))
         return sal_False;// we are already behind the last row or before the first
@@ -1077,7 +1077,7 @@ sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_bBeforeFirst)
         return sal_False;
@@ -1135,7 +1135,7 @@ void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException)
         throw DisposedException();
 
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     if(m_bBeforeFirst || m_bAfterLast)
         return; // nothing to do here
@@ -1152,7 +1152,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeExcepti
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     return m_pCache->rowUpdated();
@@ -1164,7 +1164,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeExcept
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     return m_pCache->rowInserted();
@@ -1176,7 +1176,7 @@ sal_Bool SAL_CALL ORowSetBase::rowDeleted(  ) throw(SQLException, RuntimeExcepti
         throw DisposedException();
 
     if(!m_pCache)
-        throw FunctionSequenceException(*m_pMySelf);
+        throwFunctionSequenceException(*m_pMySelf);
 
     ::osl::MutexGuard aGuard( m_rMutex );
     return m_pCache->rowDeleted();
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index a1f5c795781a..7670bef4eb6d 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetCache.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-06 10:51:29 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -428,7 +428,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL ORowSetCache::get
 sal_Bool SAL_CALL ORowSetCache::wasNull(  ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -438,7 +438,7 @@ sal_Bool SAL_CALL ORowSetCache::wasNull(  ) throw(SQLException, RuntimeException
 ::rtl::OUString SAL_CALL ORowSetCache::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -450,7 +450,7 @@ sal_Bool SAL_CALL ORowSetCache::wasNull(  ) throw(SQLException, RuntimeException
 sal_Bool SAL_CALL ORowSetCache::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -461,7 +461,7 @@ sal_Bool SAL_CALL ORowSetCache::getBoolean( sal_Int32 columnIndex ) throw(SQLExc
 sal_Int8 SAL_CALL ORowSetCache::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -472,7 +472,7 @@ sal_Int8 SAL_CALL ORowSetCache::getByte( sal_Int32 columnIndex ) throw(SQLExcept
 sal_Int16 SAL_CALL ORowSetCache::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -483,7 +483,7 @@ sal_Int16 SAL_CALL ORowSetCache::getShort( sal_Int32 columnIndex ) throw(SQLExce
 sal_Int32 SAL_CALL ORowSetCache::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -494,7 +494,7 @@ sal_Int32 SAL_CALL ORowSetCache::getInt( sal_Int32 columnIndex ) throw(SQLExcept
 sal_Int64 SAL_CALL ORowSetCache::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -505,7 +505,7 @@ sal_Int64 SAL_CALL ORowSetCache::getLong( sal_Int32 columnIndex ) throw(SQLExcep
 float SAL_CALL ORowSetCache::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -516,7 +516,7 @@ float SAL_CALL ORowSetCache::getFloat( sal_Int32 columnIndex ) throw(SQLExceptio
 double SAL_CALL ORowSetCache::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -527,7 +527,7 @@ double SAL_CALL ORowSetCache::getDouble( sal_Int32 columnIndex ) throw(SQLExcept
 Sequence< sal_Int8 > SAL_CALL ORowSetCache::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -538,7 +538,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetCache::getBytes( sal_Int32 columnIndex ) th
 ::com::sun::star::util::Date SAL_CALL ORowSetCache::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -549,7 +549,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetCache::getBytes( sal_Int32 columnIndex ) th
 ::com::sun::star::util::Time SAL_CALL ORowSetCache::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -560,7 +560,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetCache::getBytes( sal_Int32 columnIndex ) th
 ::com::sun::star::util::DateTime SAL_CALL ORowSetCache::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -571,7 +571,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSetCache::getBytes( sal_Int32 columnIndex ) th
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetCache::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -582,7 +582,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetCache::getBinary
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetCache::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     OSL_ENSURE(m_aMatrixIter != m_pMatrix->end(),"Iterator is equal end()");
 
@@ -593,7 +593,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetCache::getCharac
 Any SAL_CALL ORowSetCache::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     return Any();
 }
@@ -601,7 +601,7 @@ Any SAL_CALL ORowSetCache::getObject( sal_Int32 columnIndex, const Reference< ::
 Reference< XRef > SAL_CALL ORowSetCache::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     return Reference< XRef >();
 }
@@ -609,7 +609,7 @@ Reference< XRef > SAL_CALL ORowSetCache::getRef( sal_Int32 columnIndex ) throw(S
 Reference< XBlob > SAL_CALL ORowSetCache::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     return Reference< XBlob >();
 }
@@ -617,7 +617,7 @@ Reference< XBlob > SAL_CALL ORowSetCache::getBlob( sal_Int32 columnIndex ) throw
 Reference< XClob > SAL_CALL ORowSetCache::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     return Reference< XClob >();
 }
@@ -625,7 +625,7 @@ Reference< XClob > SAL_CALL ORowSetCache::getClob( sal_Int32 columnIndex ) throw
 Reference< XArray > SAL_CALL ORowSetCache::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     return Reference< XArray >();
 }
@@ -635,7 +635,7 @@ Reference< XArray > SAL_CALL ORowSetCache::getArray( sal_Int32 columnIndex ) thr
 Any SAL_CALL ORowSetCache::getBookmark(  ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast)
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     if(m_aMatrixIter == m_pMatrix->end() || !(*m_aMatrixIter).isValid())
     {
@@ -732,7 +732,7 @@ sal_Int32 SAL_CALL ORowSetCache::hashBookmark( const Any& bookmark ) throw(SQLEx
 void SAL_CALL ORowSetCache::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -744,7 +744,7 @@ void SAL_CALL ORowSetCache::updateNull( sal_Int32 columnIndex ) throw(SQLExcepti
 void SAL_CALL ORowSetCache::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -756,7 +756,7 @@ void SAL_CALL ORowSetCache::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) t
 void SAL_CALL ORowSetCache::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -768,7 +768,7 @@ void SAL_CALL ORowSetCache::updateByte( sal_Int32 columnIndex, sal_Int8 x ) thro
 void SAL_CALL ORowSetCache::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -780,7 +780,7 @@ void SAL_CALL ORowSetCache::updateShort( sal_Int32 columnIndex, sal_Int16 x ) th
 void SAL_CALL ORowSetCache::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -792,7 +792,7 @@ void SAL_CALL ORowSetCache::updateInt( sal_Int32 columnIndex, sal_Int32 x ) thro
 void SAL_CALL ORowSetCache::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -804,7 +804,7 @@ void SAL_CALL ORowSetCache::updateLong( sal_Int32 columnIndex, sal_Int64 x ) thr
 void SAL_CALL ORowSetCache::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -816,7 +816,7 @@ void SAL_CALL ORowSetCache::updateFloat( sal_Int32 columnIndex, float x ) throw(
 void SAL_CALL ORowSetCache::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -828,7 +828,7 @@ void SAL_CALL ORowSetCache::updateDouble( sal_Int32 columnIndex, double x ) thro
 void SAL_CALL ORowSetCache::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -840,7 +840,7 @@ void SAL_CALL ORowSetCache::updateString( sal_Int32 columnIndex, const ::rtl::OU
 void SAL_CALL ORowSetCache::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -852,7 +852,7 @@ void SAL_CALL ORowSetCache::updateBytes( sal_Int32 columnIndex, const Sequence<
 void SAL_CALL ORowSetCache::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -864,7 +864,7 @@ void SAL_CALL ORowSetCache::updateDate( sal_Int32 columnIndex, const ::com::sun:
 void SAL_CALL ORowSetCache::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -876,7 +876,7 @@ void SAL_CALL ORowSetCache::updateTime( sal_Int32 columnIndex, const ::com::sun:
 void SAL_CALL ORowSetCache::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex < 1 || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -888,7 +888,7 @@ void SAL_CALL ORowSetCache::updateTimestamp( sal_Int32 columnIndex, const ::com:
 void SAL_CALL ORowSetCache::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex < 1 || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     Sequence<sal_Int8> aSeq;
@@ -904,7 +904,7 @@ void SAL_CALL ORowSetCache::updateBinaryStream( sal_Int32 columnIndex, const Ref
 void SAL_CALL ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex < 1 || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     Sequence<sal_Int8> aSeq;
@@ -921,7 +921,7 @@ void SAL_CALL ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const
 void SAL_CALL ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex < 1 || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -933,7 +933,7 @@ void SAL_CALL ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x )
 void SAL_CALL ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
     if(m_bAfterLast || columnIndex < 1 || columnIndex >= (sal_Int32)(*m_aInsertRow)->size())
-        throw FunctionSequenceException(m_xSet.get());
+        throwFunctionSequenceException(m_xSet.get());
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     (*(*m_aInsertRow))[columnIndex].setBound(sal_True);
@@ -1666,7 +1666,7 @@ void SAL_CALL ORowSetCache::cancelRowUpdates(  ) throw(SQLException, RuntimeExce
     if(!m_nPosition)
     {
         OSL_ENSURE(0,"cancelRowUpdates:Invalid positions pos == 0");
-        throw ::dbtools::FunctionSequenceException(NULL);
+        ::dbtools::throwFunctionSequenceException(NULL);
     }
 
     if(m_pCacheSet->absolute(m_nPosition))
@@ -1674,7 +1674,7 @@ void SAL_CALL ORowSetCache::cancelRowUpdates(  ) throw(SQLException, RuntimeExce
     else
     {
         OSL_ENSURE(0,"cancelRowUpdates couldn't position right with absolute");
-        throw ::dbtools::FunctionSequenceException(NULL);
+        ::dbtools::throwFunctionSequenceException(NULL);
     }
 }
 // -------------------------------------------------------------------------
@@ -1807,6 +1807,9 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.30  2001/04/06 10:51:29  oj
+    #85825# initialize pcache=NULL
+
     Revision 1.29  2001/04/05 14:14:41  oj
     #85788# absolut(-1) is last record
 
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 29fb1b32b9d3..53f2ffa7bc5e 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: resultset.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-06 08:59:52 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -598,7 +598,7 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateNull(columnIndex);
 }
@@ -611,7 +611,7 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateBoolean(columnIndex, x);
 }
@@ -623,7 +623,7 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateByte(columnIndex, x);
 }
@@ -635,7 +635,7 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateShort(columnIndex, x);
 }
@@ -647,7 +647,7 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateInt(columnIndex, x);
 }
@@ -659,7 +659,7 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateLong(columnIndex, x);
 }
@@ -671,7 +671,7 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateFloat(columnIndex, x);
 }
@@ -683,7 +683,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateDouble(columnIndex, x);
 }
@@ -695,7 +695,7 @@ void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) thr
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateString(columnIndex, x);
 }
@@ -707,7 +707,7 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >&
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateBytes(columnIndex, x);
 }
@@ -719,7 +719,7 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util:
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateDate(columnIndex, x);
 }
@@ -731,7 +731,7 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util:
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateTime(columnIndex, x);
 }
@@ -743,7 +743,7 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateTimestamp(columnIndex, x);
 }
@@ -755,7 +755,7 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::co
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateBinaryStream(columnIndex, x, length);
 }
@@ -767,7 +767,7 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< :
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateCharacterStream(columnIndex, x, length);
 }
@@ -779,7 +779,7 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateNumericObject(columnIndex, x, scale);
 }
@@ -792,7 +792,7 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     m_xAggregateAsRowUpdate->updateObject(columnIndex, x);
 }
@@ -987,7 +987,7 @@ Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->getBookmark();
 }
@@ -1000,7 +1000,7 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru
         throw DisposedException();
 
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToBookmark(bookmark);
 }
@@ -1012,7 +1012,7 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
     if (OResultSetBase::rBHelper.bDisposed)
         throw DisposedException();
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows);
 }
@@ -1025,7 +1025,7 @@ sal_Int32 OResultSet::compareBookmarks(const Any& first, const Any& second) thro
         throw DisposedException();
 
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->compareBookmarks(first, second);
 }
@@ -1038,7 +1038,7 @@ sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeExcep
         throw DisposedException();
 
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->hasOrderedBookmarks();
 }
@@ -1051,7 +1051,7 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run
         throw DisposedException();
 
     if (!m_bIsBookmarkable)
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->hashBookmark(bookmark);
 }
@@ -1065,7 +1065,7 @@ void OResultSet::insertRow(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->insertRow();
 }
@@ -1078,7 +1078,7 @@ void OResultSet::updateRow(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->updateRow();
 }
@@ -1091,7 +1091,7 @@ void OResultSet::deleteRow(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->deleteRow();
 }
@@ -1104,7 +1104,7 @@ void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->cancelRowUpdates();
 }
@@ -1117,7 +1117,7 @@ void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToInsertRow();
 }
@@ -1130,7 +1130,7 @@ void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException )
         throw DisposedException();
 
     if (isReadOnly())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToCurrentRow();
 }
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 0f11a62c7341..9d697ddbdf7a 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: statement.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-23 13:18:50 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -348,7 +348,7 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLExcep
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsMultipleResultSets())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getResultSet();
 }
@@ -362,7 +362,7 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, Runtim
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsMultipleResultSets())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getUpdateCount();
 }
@@ -376,7 +376,7 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, Runtime
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsMultipleResultSets())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     // free the previous results
     disposeResultSet();
@@ -394,7 +394,7 @@ void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException)
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsBatchUpdates())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch();
 }
@@ -408,7 +408,7 @@ void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeExceptio
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsBatchUpdates())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch();
 }
@@ -422,7 +422,7 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLExcepti
 
     // first check the meta data
     if (!Reference< XConnection > (m_xParent, UNO_QUERY)->getMetaData()->supportsBatchUpdates())
-        throw FunctionSequenceException(*this);
+        throwFunctionSequenceException(*this);
 
     // free the previous results
     disposeResultSet();
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index bdaaa48aaf46..eb2e9c1aaa5f 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-06 08:59:21 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -537,7 +537,7 @@ void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const
 
         ::dbtools::composeTableName(m_xMetaData,sCatalog,sSchema,m_Name,sComposedName,sal_True);
         if(!sComposedName.getLength())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         sSql += sComposedName;
         sSql += ::rtl::OUString::createFromAscii(" ALTER ");
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index ddf51d79449d..01f0352037f0 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablecontainer.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-18 14:36:54 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:14:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -553,7 +553,7 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
 
         ::dbtools::composeTableName(m_xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_True);
         if(!sComposedName.getLength())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         aSql += sComposedName + ::rtl::OUString::createFromAscii(" (");
 
@@ -562,7 +562,7 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
         Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
         // check if there are columns
         if(!xColumns.is() || !xColumns->getCount())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         Reference< XPropertySet > xColProp;
 
@@ -628,13 +628,13 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
                     if(nKeyType == KeyType::PRIMARY)
                     {
                         if(!bPKey)
-                            throw ::dbtools::FunctionSequenceException(*this);
+                            ::dbtools::throwFunctionSequenceException(*this);
 
                         bPKey = sal_True;
                         xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
                         xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
                         if(!xColumns.is() || !xColumns->getCount())
-                            throw ::dbtools::FunctionSequenceException(*this);
+                            ::dbtools::throwFunctionSequenceException(*this);
 
                         aSql += ::rtl::OUString::createFromAscii(" PRIMARY KEY (");
                         for(sal_Int32 i=0;i<xColumns->getCount();++i)
@@ -651,7 +651,7 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
                         xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
                         xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
                         if(!xColumns.is() || !xColumns->getCount())
-                            throw ::dbtools::FunctionSequenceException(*this);
+                            ::dbtools::throwFunctionSequenceException(*this);
 
                         aSql += ::rtl::OUString::createFromAscii(" UNIQUE (");
                         for(sal_Int32 i=0;i<xColumns->getCount();++i)
@@ -670,7 +670,7 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
                         xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
                         xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
                         if(!xColumns.is() || !xColumns->getCount())
-                            throw ::dbtools::FunctionSequenceException(*this);
+                            ::dbtools::throwFunctionSequenceException(*this);
 
                         aSql += ::rtl::OUString::createFromAscii(" FOREIGN KEY ");
                         ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(PROPERTY_REFERENCEDTABLE));
@@ -683,7 +683,7 @@ void SAL_CALL OTableContainer::appendByDescriptor( const Reference< XPropertySet
 
 
                         if(!sComposedName.getLength())
-                            throw ::dbtools::FunctionSequenceException(*this);
+                            ::dbtools::throwFunctionSequenceException(*this);
                         aSql += sComposedName + ::rtl::OUString::createFromAscii(" (");
 
                         for(sal_Int32 i=0;i<xColumns->getCount();++i)
@@ -784,7 +784,7 @@ void SAL_CALL OTableContainer::dropByName( const ::rtl::OUString& elementName )
         }
 
         if(!sComposedName.getLength())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP TABLE ");
         aSql += sComposedName;
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 9e4f01130715..f8df046ca4cb 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewcontainer.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-29 07:06:28 $
+ *  last change: $Author: fs $ $Date: 2001-04-19 07:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -355,7 +355,7 @@ void SAL_CALL OViewContainer::appendByDescriptor( const Reference< XPropertySet
 
         ::dbtools::composeTableName(m_xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_True);
         if(!sComposedName.getLength())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         aSql += sComposedName + ::rtl::OUString::createFromAscii(" AS ");
         ::rtl::OUString sCommand;
@@ -400,7 +400,7 @@ void SAL_CALL OViewContainer::dropByName( const ::rtl::OUString& elementName ) t
         }
 
         if(!sComposedName.getLength())
-            throw ::dbtools::FunctionSequenceException(*this);
+            ::dbtools::throwFunctionSequenceException(*this);
 
         ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW ");
         aSql += sComposedName;