#86528# size changes

3 files changed, 25 insertions, 26 deletions

diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index ab09a4fa163e..f029257492aa 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EConnection.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-27 10:08:10 $
+ *  last change: $Author: oj $ $Date: 2001-05-17 06:46:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,8 +167,8 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
 Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OConnection_B::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OConnection_B::rBHelper.bDisposed);
+
 
     Reference< XDatabaseMetaData > xMetaData = m_xMetaData;
     if(!xMetaData.is())
@@ -196,8 +196,8 @@ Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(S
 Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OConnection_B::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OConnection_B::rBHelper.bDisposed);
+
     OFlatStatement* pStmt = new OFlatStatement(this);
 
     Reference< XStatement > xStmt = pStmt;
@@ -208,10 +208,10 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLE
 Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OConnection_B::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OConnection_B::rBHelper.bDisposed);
 
-    OFlatPreparedStatement* pStmt = new OFlatPreparedStatement(this,m_aTypeInfo);
+
+    OFlatPreparedStatement* pStmt = new OFlatPreparedStatement(this);
     Reference< XPreparedStatement > xStmt = pStmt;
     pStmt->construct(sql);
 
@@ -222,8 +222,8 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons
 Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OConnection_B::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OConnection_B::rBHelper.bDisposed);
+
     return NULL;
 }
 
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 4cdf9e7ed8b4..14e77d710e2d 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.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:37:36 $
+ *  last change: $Author: oj $ $Date: 2001-05-17 06:46:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,8 +154,8 @@ Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException)
 Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
      ::osl::MutexGuard aGuard( m_aMutex );
-        if (OResultSet_BASE::rBHelper.bDisposed)
-        throw DisposedException();
+        checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
 
     return makeAny((sal_Int32)(*m_aRow)[0]);
 }
@@ -163,8 +163,8 @@ Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcept
 sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-        if (OResultSet_BASE::rBHelper.bDisposed)
-        throw DisposedException();
+        checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
 
     m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
 
@@ -174,8 +174,8 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw(
 sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-        if (OResultSet_BASE::rBHelper.bDisposed)
-        throw DisposedException();
+        checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
 
     m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False;
 
@@ -186,8 +186,8 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark,
 sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const  Any& first, const  Any& second ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OResultSet_BASE::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
 
     return (first == second) ? 0 : 2;
 }
@@ -200,8 +200,8 @@ sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks(  ) throw( SQLException,
 sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    if (OResultSet_BASE::rBHelper.bDisposed)
-        throw DisposedException();
+    checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+
 
     return connectivity::getINT32(bookmark);
 }
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 4592962419a2..7de72345e2d3 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: oj $ $Date: 2001-05-14 13:36:27 $
+#   last change: $Author: oj $ $Date: 2001-05-17 06:46:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -123,7 +123,6 @@ SHL1STDLIBS+= ifile$(UPD).lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/file.lib
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def