proofreading and corrections from Richard Holt

32 files changed, 309 insertions, 181 deletions

diff --git a/offapi/com/sun/star/sdbc/BestRowScope.idl b/offapi/com/sun/star/sdbc/BestRowScope.idl
index ada58740f951..ba8a6b3bd9c1 100644
--- a/offapi/com/sun/star/sdbc/BestRowScope.idl
+++ b/offapi/com/sun/star/sdbc/BestRowScope.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BestRowScope.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,7 @@ constants BestRowScope
 
     // DocMerge from idl: value com::sun::star::sdbc::BestRowScope::TEMPORARY
     /** indicates that the scope of the best row identifier is
-             very temporary, lasting only while the
-             row is being used.
+             very temporary, lasting only while the row is being used.
              A possible value for the column
              <code>SCOPE</code>
              in the <code>XResultSet</code> object
@@ -110,6 +109,9 @@ constants BestRowScope
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:38  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/BestRowType.idl b/offapi/com/sun/star/sdbc/BestRowType.idl
index c548f40136e5..162e69150a74 100644
--- a/offapi/com/sun/star/sdbc/BestRowType.idl
+++ b/offapi/com/sun/star/sdbc/BestRowType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BestRowType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@ constants BestRowType
 {
 
     // DocMerge from idl: value com::sun::star::sdbc::BestRowType::UNKNOWN
-    /** indicates that the best row identifier may or may not be a pseudo column.
+    /** indicates that the best row identifier may or may not be a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -81,7 +81,7 @@ constants BestRowType
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::BestRowType::NOT_PSEUDO
-    /** indicates that the best row identifier is NOT a pseudo column.
+    /** indicates that the best row identifier is NOT a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -91,7 +91,7 @@ constants BestRowType
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::BestRowType::PSEUDO
-    /** indicates that the best row identifier is a pseudo column.
+    /** indicates that the best row identifier is a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -106,6 +106,9 @@ constants BestRowType
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:38  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/CallableStatement.idl b/offapi/com/sun/star/sdbc/CallableStatement.idl
index 9cdd77c3042f..98a1661e492d 100644
--- a/offapi/com/sun/star/sdbc/CallableStatement.idl
+++ b/offapi/com/sun/star/sdbc/CallableStatement.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CallableStatement.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ interface XOutParameters;
     to be called in a standard way for all RDBMSs. This escape syntax has one
     form that includes a result parameter and one that does not. If used, the
     result parameter must be registered as an OUT parameter. The other parameters
-    can be used for input, output or both. Parameters are referred to sequentially,
+    can be used for input, output, or both. Parameters are referred to sequentially,
     by number. The first parameter is 1.
     </p>
     <p>
@@ -101,7 +101,7 @@ interface XOutParameters;
     <p>For maximum portability, a call's <code>ResultSet</code> objects and
     update counts should be processed prior to getting the values of output
     parameters.</p>
- */
+*/
 service CallableStatement
 {
     // DocMerge: empty anyway
@@ -126,6 +126,9 @@ service CallableStatement
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:39  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/ChangeEvent.idl b/offapi/com/sun/star/sdbc/ChangeEvent.idl
index 8bcd794bf736..c36455b3451a 100644
--- a/offapi/com/sun/star/sdbc/ChangeEvent.idl
+++ b/offapi/com/sun/star/sdbc/ChangeEvent.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ChangeEvent.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,7 +76,7 @@ struct ChangeEvent : com::sun::star::lang::EventObject
      */
     long Action;
 
-    /** indicates the number of rows affectd by the change. */
+    /** indicates the number of rows affected by the change. */
     long Rows;
 };
 
diff --git a/offapi/com/sun/star/sdbc/ColumnType.idl b/offapi/com/sun/star/sdbc/ColumnType.idl
index bc645425e8df..6aa80e43799f 100644
--- a/offapi/com/sun/star/sdbc/ColumnType.idl
+++ b/offapi/com/sun/star/sdbc/ColumnType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ColumnType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@ constants ColumnType
 {
 
     // DocMerge from idl: value com::sun::star::sdbc::ColumnType::UNKNOWN
-    /** indicates that this column may or may not be a pseudo column.
+    /** indicates that this column may or may not be a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -81,7 +81,7 @@ constants ColumnType
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::ColumnType::NOT_PSEUDO
-    /** indicates that this column is NOT a pseudo column.
+    /** indicates that this column is NOT a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -91,7 +91,7 @@ constants ColumnType
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::ColumnType::PSEUDO
-    /** indicates that this column is a pseudo column.
+    /** indicates that this column is a pseudo-column.
              A possible value for the column
              <code>PSEUDO_COLUMN</code>
              in the <code>XResultSet</code> object
@@ -106,6 +106,9 @@ constants ColumnType
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:39  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/Deferrability.idl b/offapi/com/sun/star/sdbc/Deferrability.idl
index d1e5043b2eff..2a87d522efc5 100644
--- a/offapi/com/sun/star/sdbc/Deferrability.idl
+++ b/offapi/com/sun/star/sdbc/Deferrability.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Deferrability.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,10 @@ constants Deferrability
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
              and <code>getCrossReference</code>.
              <P>Indicates deferrability.  See SQL-92 for a definition.
-     */
+
+<!-- JRH: This and next two comments are identical. Is something missing?
+            INITIALLY_DEFERRED, INITIALLY_IMMEDIATE, and NONE?              -->
+*/
     const long INITIALLY_DEFERRED  = 5;
     //-------------------------------------------------------------------------
 
@@ -109,6 +112,9 @@ constants Deferrability
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:39  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/Driver.idl b/offapi/com/sun/star/sdbc/Driver.idl
index f3b7a20eeeb6..858d750e5e3b 100644
--- a/offapi/com/sun/star/sdbc/Driver.idl
+++ b/offapi/com/sun/star/sdbc/Driver.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Driver.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,6 +105,9 @@ service Driver
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:39  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index cf022df9e889..ee6ae825225e 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DriverManager.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,7 @@ service DriverManager
     interface XDriverManager;
 
     // DocMerge from xml: service com::sun::star::sdbc::DriverManager: interface com::sun::star::container::XEnumerationAccess
-    /** creates an enumeration on all installed/ registered drivers.
+    /** creates an enumeration on all installed / registered drivers.
      */
     interface com::sun::star::container::XEnumerationAccess;
 };
@@ -107,6 +107,9 @@ service DriverManager
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:39  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/KeyRule.idl b/offapi/com/sun/star/sdbc/KeyRule.idl
index 2ec5b6d4f9ca..8157c9269181 100644
--- a/offapi/com/sun/star/sdbc/KeyRule.idl
+++ b/offapi/com/sun/star/sdbc/KeyRule.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: KeyRule.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@ constants KeyRule
 {
 
     // DocMerge from idl: value com::sun::star::sdbc::KeyRule::CASCADE
-    /** A possible value for the columns <code>UPDATE_RULE</code>
+    /** a possible value for the column's <code>UPDATE_RULE</code>
              and <code>DELETE_RULE</code> in the
              <code>XResultSet</code> objects returned by the methods
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
@@ -89,7 +89,7 @@ constants KeyRule
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::KeyRule::RESTRICT
-    /** A possible value for the columns <code>UPDATE_RULE</code>
+    /** a possible value for the column's <code>UPDATE_RULE</code>
              and <code>DELETE_RULE</code> in the
              <code>XResultSet</code> objects returned by the methods
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
@@ -105,7 +105,7 @@ constants KeyRule
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::KeyRule::SET_NULL
-    /** A possible value for the columns <code>UPDATE_RULE</code>
+    /** a possible value for the column's <code>UPDATE_RULE</code>
              and <code>DELETE_RULE</code> in the
              <code>XResultSet</code> objects returned by the methods
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
@@ -120,7 +120,7 @@ constants KeyRule
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::KeyRule::NO_ACTION
-    /** A possible value for the columns <code>UPDATE_RULE</code>
+    /** a possible value for the column's <code>UPDATE_RULE</code>
              and <code>DELETE_RULE</code> in the
              <code>XResultSet</code> objects returned by the methods
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
@@ -134,7 +134,7 @@ constants KeyRule
     //-------------------------------------------------------------------------
 
     // DocMerge from idl: value com::sun::star::sdbc::KeyRule::SET_DEFAULT
-    /** A possible value for the columns <code>UPDATE_RULE</code>
+    /** a possible value for the column's <code>UPDATE_RULE</code>
              and <code>DELETE_RULE</code> in the
              <code>XResultSet</code> objects returned by the methods
              <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
@@ -154,6 +154,9 @@ constants KeyRule
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:40  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index 1fa235657f5b..f4d4de5eed05 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PreparedStatement.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-20 13:30:07 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,21 +130,21 @@ service PreparedStatement
     interface com::sun::star::beans::XPropertySet;
 
     // DocMerge from xml: service com::sun::star::sdbc::PreparedStatement: interface com::sun::star::util::XCancellable
-    /** could be used for cancelling the execution of SQL statements if both
-             if both the DBMS and the driver support aborting an SQL statement.
+    /** could be used for cancelling the execution of SQL statements, if both
+             the DBMS and the driver support aborting an SQL statement.
              The implementation is optional.
      */
     [optional] interface com::sun::star::util::XCancellable;
 
 
     // DocMerge from xml: service com::sun::star::sdbc::PreparedStatement: interface com::sun::star::sdbc::XPreparedStatement
-    /** is the interface for executing sql prepared commands.
+    /** is the interface for executing SQL prepared commands.
      */
     interface XPreparedStatement;
 
 
     // DocMerge from xml: service com::sun::star::sdbc::PreparedStatement: interface com::sun::star::sdbc::XResultSetMetaDataSupplier
-    /** provides the access to the result set description.
+    /** provides access to the result set description.
      */
     interface XResultSetMetaDataSupplier;
 
@@ -183,7 +183,7 @@ service PreparedStatement
     // DocMerge from idl: property com::sun::star::sdbc::PreparedStatement::QueryTimeOut
     /** retrieves the number of seconds the driver will wait for a Statement
               to execute. If the limit is exceeded, a SQLException is thrown.
-              There is no limitation if set to zero.
+              There is no limitation, if set to zero.
      */
     [property] long QueryTimeOut;
 
@@ -194,7 +194,7 @@ service PreparedStatement
               for any column value. The limit applies only to BINARY,
               VARBINARY, LONGVARBINARY, CHAR, VARCHAR, and LONGVARCHAR columns.
               If the limit is exceeded, the excess data is silently discarded.
-              <br>There is no limitation if set to zero.
+              <br>There is no limitation, if set to zero.
      */
     [property] long MaxFieldSize;
 
@@ -202,7 +202,7 @@ service PreparedStatement
     // DocMerge from idl: property com::sun::star::sdbc::PreparedStatement::MaxRows
     /** retrieves the maximum number of rows that a ResultSet can contain.
              If the limit is exceeded, the excess rows are silently dropped.
-             <br>There is no limitation if set to zero.
+             <br>There is no limitation, if set to zero.
      */
     [property] long MaxRows;
 
@@ -212,7 +212,7 @@ service PreparedStatement
              <code>execute</code> methods.
              <p>This name can then be used in SQL positioned update/delete statements to
              identify the current row in the ResultSet generated by this statement. If
-             the database doesn't support positioned update/delete, this property is
+             the database does not support positioned update/delete, this property is
              a noop. To insure that a cursor has the proper isolation level to support
              updates, the cursor's SELECT statement should be of the form
              'select for update ...'. If the 'for update' phrase is omitted,
@@ -264,6 +264,9 @@ service PreparedStatement
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.6  2001/02/20 13:30:07  fs
+    #82875# removed XClearParameters - this interface is obsolete, the functionality is covered by XParameters
+
     Revision 1.5  2001/01/23 10:08:28  mi
     optional interfaces now marked as [optional] instead of just a prosa description of this fact
 
diff --git a/offapi/com/sun/star/sdbc/ProcedureColumn.idl b/offapi/com/sun/star/sdbc/ProcedureColumn.idl
index e2261d882428..d89b526f27a1 100644
--- a/offapi/com/sun/star/sdbc/ProcedureColumn.idl
+++ b/offapi/com/sun/star/sdbc/ProcedureColumn.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ProcedureColumn.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@ constants ProcedureColumn
 {
 
     // DocMerge from idl: value com::sun::star::sdbc::ProcedureColumn::UNKNOWN
-    /** indicates that type of the column is unknown. A possible value for
+    /** indicates that the type of the column is unknown. A possible value for
              the column <code>COLUMN_TYPE</code> in the <code>XResultSet</code>
              returned by the method <code>getProcedureColumns</code>.
      */
@@ -134,6 +134,9 @@ constants ProcedureColumn
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:40  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index 51c0791055b0..9d8dcf81243a 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ResultSet.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-01-23 10:08:29 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,7 @@ interface XCloseable;
     </p>
     <p>The getXXX methods retrieve column values for the current
     row. You can retrieve values using either the index number of the
-    column of the column. Columns are numbered from 1.
+    column. Columns are numbered from 1.
     </p>
     <p>For maximum portability, ResultSet columns within each row should be
     read in left-to-right order and each column should be read only once.
@@ -120,7 +120,7 @@ interface XCloseable;
     generated it when that Statement is closed, re-executed, or used
     to retrieve the next result from a sequence of multiple results.
     </p>
-    <p>The number, types and properties of a ResultSet's columns are
+    <p>The number, types, and properties of a ResultSet's columns are
     provided by the ResultSetMetaData object returned by the getMetaData
     method.</p>
  */
@@ -128,7 +128,7 @@ service ResultSet
 {
 
     // DocMerge from xml: service com::sun::star::sdbc::ResultSet: interface com::sun::star::lang::XComponent
-    /** optional for implementation, controls the releasing of resources
+    /** optional for implementation; controls the releasing of resources
              and the notification of registered listeners.
      */
     [optional] interface com::sun::star::lang::XComponent;
@@ -262,6 +262,9 @@ service ResultSet
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/01/23 10:08:29  mi
+    optional interfaces now marked as [optional] instead of just a prosa description of this fact
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index ac79d49f8d38..2ea716cf860b 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-20 13:30:07 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,11 +83,11 @@ interface XParameters;
     <p> It acts like a typical bean. Before you use the RowSet, you have to specify a
     set of properties like a DataSource and a Command and other properties known of
     Statement.<br>
-    Afterwards you can populate the RowSet by its execute method to fill the set
+    Afterwards, you can populate the RowSet by its execute method to fill the set
     with data.
     </p>
-    <p>On the one hand a RowSet can be used as a short cut to retrieve the data of a DataSource.
-    You don't have to establish a connection, create a Statement and then create
+    <p>On the one hand, a RowSet can be used as a short cut to retrieve the data of a DataSource.
+    You don't have to establish a connection, create a Statement, and then create
     a ResultSet. On the other hand, a rowset can be used to implement capabilties for
     a result set, which are not supported by a driver result set, like caching
     strategies or update capabilities.</p>
@@ -147,7 +147,7 @@ service RowSet
     // DocMerge from xml: property com::sun::star::container::com::sun::star::sdbc::RowSet::QueryTimeOut
     /** retrieves the number of seconds the driver will wait for a Statement
         to execute. If the limit is exceeded, a SQLException is thrown.
-        There is no limitation if set to zero.
+        There is no limitation, if set to zero.
      */
     [property] long QueryTimeOut;
 
@@ -160,7 +160,7 @@ service RowSet
         for any column value. The limit applies only to BINARY,
         VARBINARY, LONGVARBINARY, CHAR, VARCHAR, and LONGVARCHAR columns.
         If the limit is exceeded, the excess data is silently discarded.
-        <br>There is no limitation if set to zero.</p>
+        <br>There is no limitation, if set to zero.</p>
      */
     [property] long MaxFieldSize;
 
@@ -168,7 +168,7 @@ service RowSet
     // DocMerge from xml: property com::sun::star::container::com::sun::star::sdbc::RowSet::MaxRows
     /** retrieves the maximum number of rows that a ResultSet can contain.
         If the limit is exceeded, the excess rows are silently dropped.
-        <br>There is no limitation if set to zero.
+        <br>There is no limitation, if set to zero.
      */
     [property] long MaxRows;
 
@@ -197,6 +197,9 @@ service RowSet
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/02/20 13:30:07  fs
+    #82875# removed XClearParameters - this interface is obsolete, the functionality is covered by XParameters
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 02d25db9e0ca..33d23616dd99 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SQLException.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,7 @@
 exception SQLException: com::sun::star::uno::Exception
 {
     // DocMerge from xml: field com::sun::star::sdbc::SQLException::SQLState
-    /** returns a string, which use the XOPEN SQLState conventions.
+    /** returns a string, which uses the XOPEN SQLState conventions.
         The values of the SQLState string are described in the XOPEN SQL spec.
      */
     string          SQLState;
@@ -92,13 +92,13 @@ exception SQLException: com::sun::star::uno::Exception
     // DocMerge from xml: field com::sun::star::sdbc::SQLException::ErrorCode
     /** returns an integer error code that is specific to each vendor.  Normally this will
         be the actual error code returned by the underlying database.
-        a chain to a next Exception.  This can be used to provide additional
+        A chain to the next Exception.  This can be used to provide additional
         error information.
      */
     long            ErrorCode;
 
     // DocMerge from xml: field com::sun::star::sdbc::SQLException::NextException
-    /** returns a chain to a next Exception.
+    /** returns a chain to the next Exception.
         This can be used to provide additional
         error information.
      */
@@ -111,6 +111,9 @@ exception SQLException: com::sun::star::uno::Exception
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:41  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index 028d24c08f1d..7294d8ecfb9b 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Statement.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-01-23 10:08:29 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,14 +113,14 @@ service Statement
 
     // DocMerge from xml: service com::sun::star::sdbc::Statement: interface com::sun::star::util::XCancellable
     /** could be used for cancelling the execution of SQL statements if both
-             if both the DBMS and the driver support aborting an SQL statement.
+             the DBMS and the driver support aborting an SQL statement.
              The implementation is optional.
      */
     [optional] interface com::sun::star::util::XCancellable;
 
 
     // DocMerge from xml: service com::sun::star::sdbc::Statement: interface com::sun::star::sdbc::XStatement
-    /** is the interface for executing sql commands.
+    /** is the interface for executing SQL commands.
      */
     interface XStatement;
 
@@ -153,20 +153,20 @@ service Statement
     // DocMerge from xml: property com::sun::star::sdbc::Statement::QueryTimeOut
     /** retrieves the number of seconds the driver will wait for a Statement
         to execute. If the limit is exceeded, a SQLException is thrown.
-        There is no limitation if set to zero.
+        There is no limitation, if set to zero.
      */
     [property] long QueryTimeOut;
 
 
     // DocMerge from xml: property com::sun::star::sdbc::Statement::MaxFieldSize
-    /** returns the maximum number of bytes allowed for any column value.
+    /**  returns the maximum number of bytes allowed for any column value.
 
 
         <p>This limit is the maximum number of bytes that can be returned
         for any column value. The limit applies only to BINARY,
         VARBINARY, LONGVARBINARY, CHAR, VARCHAR, and LONGVARCHAR columns.
         If the limit is exceeded, the excess data is silently discarded.
-        <br>There is no limitation if set to zero.</p>
+        <br>There is no limitation, if set to zero.</p>
      */
     [property] long MaxFieldSize;
 
@@ -174,7 +174,7 @@ service Statement
     // DocMerge from xml: property com::sun::star::sdbc::Statement::MaxRows
     /** retrieves the maximum number of rows that a ResultSet can contain.
         If the limit is exceeded, the excess rows are silently dropped.
-        <br>There is no limitation if set to zero.
+        <br>There is no limitation, if set to zero.
      */
     [property] long MaxRows;
 
@@ -186,7 +186,7 @@ service Statement
 
         <p>This name can then be used in SQL positioned update/delete statements to
         identify the current row in the ResultSet generated by this statement. If
-        the database doesn't support positioned update/delete, this property is
+        the database does not support positioned update/delete, this property is
         a noop. To insure that a cursor has the proper isolation level to support
         updates, the cursor's SELECT statement should be of the form
         'select for update ...'. If the 'for update' phrase is omitted,
@@ -246,6 +246,9 @@ service Statement
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.5  2001/01/23 10:08:29  mi
+    optional interfaces now marked as [optional] instead of just a prosa description of this fact
+
     Revision 1.4  2000/12/19 16:03:44  mi
     documentations syntax errors fixed
 
diff --git a/offapi/com/sun/star/sdbc/TransactionIsolation.idl b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
index 1ba1a3f1b426..e0323390e5f4 100644
--- a/offapi/com/sun/star/sdbc/TransactionIsolation.idl
+++ b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransactionIsolation.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:43:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,7 @@
 
 
 // DocMerge from idl: constants com::sun::star::sdbc::TransactionIsolation
-/** distinguishs different possible transaction isolation levels.
+/** distinguishes different possible transaction isolation levels.
  */
 constants TransactionIsolation
 {
@@ -121,6 +121,9 @@ constants TransactionIsolation
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/11/08 12:43:35  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:41  hjs
     initial import
 
diff --git a/offapi/com/sun/star/sdbc/XCloseable.idl b/offapi/com/sun/star/sdbc/XCloseable.idl
index 73a676d55c7a..cd5d2f92caf0 100644
--- a/offapi/com/sun/star/sdbc/XCloseable.idl
+++ b/offapi/com/sun/star/sdbc/XCloseable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XCloseable.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 
 
 // DocMerge from xml: interface com::sun::star::sdbc::XCloseable
-/** provides the releasing of resources acquired by the implementing object.
+/** provides for the releasing of resources acquired by the implementing object.
  */
 interface XCloseable: com::sun::star::uno::XInterface
 {
@@ -90,6 +90,9 @@ interface XCloseable: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XConnection.idl b/offapi/com/sun/star/sdbc/XConnection.idl
index 27947dda4c1c..ac5856dcc6ef 100644
--- a/offapi/com/sun/star/sdbc/XConnection.idl
+++ b/offapi/com/sun/star/sdbc/XConnection.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XConnection.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -270,7 +270,7 @@ interface XConnection: com::sun::star::sdbc::XCloseable
 
         <p>
         <b>Note:</b> This method cannot be called while in the
-        middle of a transaction; calling setReadOnly with <TRUE/> does not
+        middle of a transaction. Calling setReadOnly with <TRUE/> does not
         necessarily cause writes to be prohibited.
         </p>
      */
@@ -323,9 +323,9 @@ interface XConnection: com::sun::star::sdbc::XCloseable
 
     // DocMerge from xml: method com::sun::star::container::com::sun::star::sdbc::XConnection::getTypeMap
     /** gets the type map object associated with this connection. Only drivers
-        how implement the custom type mapping facility will return an object otherwise
+        which implement the custom type mapping facility will return an object otherwise
         NULL could be returned.
-
+<!-- JRH: changed "how implement" to "which implement"  -->
 
         <p>Unless the application has added an entry to the type map, the map
         returned will be empty.
@@ -340,8 +340,7 @@ interface XConnection: com::sun::star::sdbc::XCloseable
         and distinct types.
 
 
-        <p>Only if the driver supports custom type mapping the setting of a map is
-        allowed.
+        <p>Only if the driver supports custom type mapping is the setting of a map allowed.
         </p>
      */
     void setTypeMap([in]com::sun::star::container::XNameAccess typeMap)
@@ -354,6 +353,9 @@ interface XConnection: com::sun::star::sdbc::XCloseable
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.6  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.5  2000/12/19 16:03:44  mi
     documentations syntax errors fixed
 
diff --git a/offapi/com/sun/star/sdbc/XDataSource.idl b/offapi/com/sun/star/sdbc/XDataSource.idl
index a61091c456f5..b21d07425c95 100644
--- a/offapi/com/sun/star/sdbc/XDataSource.idl
+++ b/offapi/com/sun/star/sdbc/XDataSource.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDataSource.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,7 @@ interface XDataSource: com::sun::star::uno::XInterface
 
 
         <p>A value of zero specifies that the timeout is the default system
-        timeout if there is one; otherwise it specifies that there is no timeout.
+        timeout if there is one; otherwise, it specifies that there is no timeout.
         When a DataSource object is created the login timeout is initially zero.
         </p>
      */
@@ -110,7 +110,7 @@ interface XDataSource: com::sun::star::uno::XInterface
 
 
         <p> A value of zero means that the timeout is the default system timeout
-        if there is one; otherwise it means that there is no timeout. When a
+        if there is one; otherwise, it means that there is no timeout. When a
         DataSource object is created the login timeout is initially zero.
         </p>
      */
@@ -123,6 +123,9 @@ interface XDataSource: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index cca1bb08b0e7..8a75d6f0a9d6 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDatabaseMetaData.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,8 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::allProceduresAreCallable
     /** Can all the procedures returned by getProcedures be called by the
         current user?
+
+<!-- JRH:/MI: These questions are unclear, see "@return\<TRUE>..." examples in this document for a better solution. -->
      */
     boolean allProceduresAreCallable() raises (SQLException);
     //-------------------------------------------------------------------------
@@ -127,20 +129,20 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::isReadOnly
-    /** check, if the database in read-only mode.
+    /** checks if the database in read-only mode.
      */
     boolean isReadOnly() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::nullsAreSortedHigh
-    /** Are NULL values sorted high ?
-     */
+    /** Are NULL values sorted high?
+<!-- JRH: meaning sorted to start of file? -->*/
     boolean nullsAreSortedHigh() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::nullsAreSortedLow
-    /** Are NULL values sorted low ?
-     */
+    /** Are NULL values sorted low?
+<!-- JRH: meaning to end of file? -->*/
     boolean nullsAreSortedLow() raises (SQLException);
     //-------------------------------------------------------------------------
 
@@ -151,7 +153,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::nullsAreSortedAtEnd
-    /** Are NULL values sorted at the end regardless of sort order?
+    /**  Are NULL values sorted at the end, regardless of sort order?
      */
     boolean nullsAreSortedAtEnd() raises (SQLException);
     //-------------------------------------------------------------------------
@@ -261,20 +263,20 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getIdentifierQuoteString
     /** What's the string used to quote SQL identifiers?
-        This returns a space " " if identifier quoting isn't supported.
+        This returns a space " " if identifier quoting is not supported.
      */
     string getIdentifierQuoteString() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getSQLKeywords
-    /** Gets a comma-separated list of all a database's SQL keywords
+    /** gets a comma-separated list of all a database's SQL keywords
         that are NOT also SQL92 keywords.
      */
     string getSQLKeywords() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getNumericFunctions
-    /** Gets a comma-separated list of math functions.  These are the
+    /** gets a comma-separated list of math functions.  These are the
         X/Open CLI math function names used in the SDBC function escape
         clause.
      */
@@ -282,7 +284,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getStringFunctions
-    /** Gets a comma-separated list of string functions.  These are the
+    /** gets a comma-separated list of string functions.  These are the
         X/Open CLI string function names used in the SDBC function escape
         clause.
      */
@@ -290,7 +292,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getSystemFunctions
-    /** Gets a comma-separated list of system functions.  These are the
+    /** gets a comma-separated list of system functions.  These are the
         X/Open CLI system function names used in the SDBC function escape
         clause.
      */
@@ -298,13 +300,13 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getTimeDateFunctions
-    /** Gets a comma-separated list of time and date functions.
+    /** gets a comma-separated list of time and date functions.
      */
     string getTimeDateFunctions() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getSearchStringEscape
-    /** Gets the string that can be used to escape wildcard characters.
+    /** gets the string that can be used to escape wildcard characters.
         This is the string that can be used to escape '_' or '%' in
         the string pattern style catalog search parameters.
 
@@ -319,26 +321,26 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::getExtraNameCharacters
-    /** Gets all the "extra" characters that can be used in unquoted
+    /** gets all the "extra" characters that can be used in unquoted
         identifier names (those beyond a-z, A-Z, 0-9 and _).
      */
     string getExtraNameCharacters() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsAlterTableWithAddColumn
-    /** support the Database "ALTER TABLE" with add column ?
+    /** support the Database "ALTER TABLE" with add column?
      */
     boolean supportsAlterTableWithAddColumn() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsAlterTableWithDropColumn
-    /** support the Database  "ALTER TABLE" with drop column ?
+    /** support the Database  "ALTER TABLE" with drop column?
      */
     boolean supportsAlterTableWithDropColumn() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsColumnAliasing
-    /** support the Database column aliasing ?
+    /** support the Database column aliasing?
 
 
         <p>The SQL AS clause can be used to provide names for
@@ -355,13 +357,17 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsTypeConversion
-    /** Support the Database the CONVERT function between SQL types ?
+    /** @returns
+            <TRUE>, if the Database supports the CONVERT function between SQL types,
+            otherwise <FALSE>.
      */
     boolean supportsTypeConversion() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsConvert
-    /** Support the Database the CONVERT between the given SQL types ?
+    /** @returns
+            <TRUE>, if the Database supports the CONVERT between the given SQL types
+            otherwise <FALSE>.
      */
     boolean supportsConvert([in]long fromType, [in]long toType)
         raises (SQLException);
@@ -438,62 +444,83 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsMinimumSQLGrammar
-    /** support the Database ODBC Minimum SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ODBC Minimum SQL grammar,
+            otherwise <FALSE>.
      */
     boolean supportsMinimumSQLGrammar() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsCoreSQLGrammar
-    /** support the Database ODBC Core SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ODBC Core SQL grammar,
+            otherwise <FALSE>.
+     */
      */
     boolean supportsCoreSQLGrammar() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsExtendedSQLGrammar
-    /** support the Database ODBC Extended SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ODBC Extended SQL grammar,
+            otherwise <FALSE>.
      */
     boolean supportsExtendedSQLGrammar() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsANSI92EntryLevelSQL
-    /** support the Database ANSI92 entry level SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ANSI92 entry level SQL grammar,
+            otherwise <FALSE>.
      */
     boolean supportsANSI92EntryLevelSQL() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsANSI92IntermediateSQL
-    /** Support the Database ANSI92 intermediate SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ANSI92 intermediate SQL grammar,
+            otherwise <FALSE>.
      */
     boolean supportsANSI92IntermediateSQL() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsANSI92FullSQL
-    /** Support the Database ANSI92 full SQL grammar ?
+    /** @returns
+            <TRUE>, if the database supports ANSI92 full SQL grammar,
+            otherwise <FALSE>.
      */
     boolean supportsANSI92FullSQL() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsIntegrityEnhancementFacility
-    /** support the Database SQL Integrity Enhancement Facility ?
+    /** returns
+            <TRUE>, if the Database supports SQL Integrity Enhancement Facility,
+            otherwise <FALSE>.
      */
     boolean supportsIntegrityEnhancementFacility() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsOuterJoins
-    /** Is some form of outer join supported?
+    /** @returns
+            <TRUE>, if some form of outer join is supported,
+            otherwise <FALSE>.
      */
     boolean supportsOuterJoins() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsFullOuterJoins
-    /** Are full nested outer joins supported?
+    /** @returns
+            <TRUE>, if full nested outer joins are supported,
+            otherwise <FALSE>.
      */
     boolean supportsFullOuterJoins() raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsLimitedOuterJoins
-    /** Is there limited support for outer joins?  (This will be true
-        if supportFullOuterJoins is true.)
+    /** @returns
+            <TRUE>, if there is limited support for outer joins.
+            (This will be true if supportFullOuterJoins is true.)
+            <FALSE> is returned otherwise.
      */
     boolean supportsLimitedOuterJoins() raises (SQLException);
     //-------------------------------------------------------------------------
@@ -818,7 +845,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsTransactions
-    /** support the Database transactions ?
+    /** support the Database transactions?
         If not, invoking the method <code>commit</code> is a noop and the
         isolation level is TransactionIsolation_NONE.
      */
@@ -826,7 +853,8 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsTransactionIsolationLevel
-    /** Does this database support the given transaction isolation level?@see com::sun::star::sdbc::Connection
+    /** Does this database support the given transaction isolation level?
+ @see com::sun::star::sdbc::Connection
      */
     boolean supportsTransactionIsolationLevel([in]long level)
                             raises (SQLException);
@@ -835,7 +863,14 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::sdbc::XDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions
     /** support the Database both data definition and data manipulation statements
         within a transaction?
-     */
+<!-- JRH: Unclear on the intent of these many support questions.
+        If asking, it should state, "Does the Database support both ....?
+        If declaring, it should state something like the following:
+
+        metadata:   supportsDataDefinitionAndDataManipulationTransactions
+
+    "provides support for both data definition and data manipulation statements within a transaction."
+ -->     */
     boolean supportsDataDefinitionAndDataManipulationTransactions()
                              raises (SQLException);
     //-------------------------------------------------------------------------
@@ -1005,8 +1040,8 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
 
 
         <p>Only table descriptions matching the catalog, schema, table
-        name and type criteria are returned.  They are ordered by
-        TABLE_TYPE, TABLE_SCHEM and TABLE_NAME.
+        name, and type criteria are returned.  They are ordered by
+        TABLE_TYPE, TABLE_SCHEM, and TABLE_NAME.
         </p>
         <p>Each table description has the following columns:
         </p>
@@ -1096,7 +1131,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
 
         <p>Only column descriptions matching the catalog, schema, table
         and column name criteria are returned.  They are ordered by
-        TABLE_SCHEM, TABLE_NAME and ORDINAL_POSITION.
+        TABLE_SCHEM, TABLE_NAME, and ORDINAL_POSITION.
         </p>
         <p>Each column description has the following columns:
         </p>
@@ -1424,7 +1459,7 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </li>
         <li>
         <b>PKCOLUMN_NAME</b> string =&amp;gt; primary key column name
-        eing imported
+        being imported
         </li>
         <li>
         <b>FKTABLE_CAT</b> string =&amp;gt; foreign key table catalog (may be null)
@@ -1978,8 +2013,8 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
         or DISTINCT.
 
 
-        <p>Only types matching the catalog, schema, type name and type
-        criteria are returned.  They are ordered by DATA_TYPE, TYPE_SCHEM
+        <p>Only types matching the catalog, schema, type name, and type
+        criteria are returned.  They are ordered by DATA_TYPE, TYPE_SCHEM,
         and TYPE_NAME.  The type name parameter may be a fully-qualified
         name.  In this case, the catalog and schemaPattern parameters are
         ignored.
@@ -2029,6 +2064,9 @@ interface XDatabaseMetaData: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.5  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.4  2000/12/14 12:53:39  mi
     <true></true> -> <TRUE/> and same with FALSE
 
diff --git a/offapi/com/sun/star/sdbc/XDriver.idl b/offapi/com/sun/star/sdbc/XDriver.idl
index ca65439e78b5..4799bd67dab5 100644
--- a/offapi/com/sun/star/sdbc/XDriver.idl
+++ b/offapi/com/sun/star/sdbc/XDriver.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDriver.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,7 +93,7 @@ interface XDriverManager;
 
     </p>
     <p>The DriverManager will try to load as many drivers as it can
-    find and then for any given connection request, it will ask each
+    find, and then for any given connection request, it will ask each
     driver in turn to try to connect to the target URL.
 
     </p>
@@ -185,6 +185,9 @@ interface XDriver: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.6  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.5  2000/12/19 13:46:04  mi
     syntax errors in documentation fixed
 
diff --git a/offapi/com/sun/star/sdbc/XParameters.idl b/offapi/com/sun/star/sdbc/XParameters.idl
index 3cc95ea8cfbf..67782c41d09d 100644
--- a/offapi/com/sun/star/sdbc/XParameters.idl
+++ b/offapi/com/sun/star/sdbc/XParameters.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XParameters.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,7 +94,7 @@ interface XClob;
 
 
 // DocMerge from xml: interface com::sun::star::io::com::sun::star::sdbc::XParameters
-/** is used for parameter setting, commently implemented in conjunction with
+/** is used for parameter setting, commonly implemented in conjunction with
     PreparedStatements.
 
 
@@ -366,6 +366,9 @@ interface XParameters: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XPooledConnection.idl b/offapi/com/sun/star/sdbc/XPooledConnection.idl
index 19de9803b374..671a17e17f04 100644
--- a/offapi/com/sun/star/sdbc/XPooledConnection.idl
+++ b/offapi/com/sun/star/sdbc/XPooledConnection.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPooledConnection.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-26 10:40:29 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,12 +79,14 @@
 interface XConnection;
 
 // DocMerge from xml: interface com::sun::star::sdbc::XPooledConnection
-/** defines a pooled connection which can share a unsed conenction
+/** defines a pooled connection which can share a unused connection.
+
+<!-- JRH: unclear meaning -->
 
     <p>When the method <code>getConnection</code> is called,
-    the PooledConnection return the conenction which is pooled
+    the PooledConnection return the connection which is pooled.
 
-    </p>@see com::sun::star::sdbc::XConnection
+    @see com::sun::star::sdbc::XConnection
  */
 interface XPooledConnection: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
index 673862c011ee..8478a96bf86d 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XResultSetMetaDataSupplier.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@ interface XResultSetMetaData;
 /** provides access to the meta data of a result set.
 
 
-    <p>The number, types and properties of a ResultSet's columns are
+    <p>The number, types, and properties of a ResultSet's columns are
     provided by the ResultSetMetaData object returned by the getMetaData
     method.</p>
  */
@@ -86,7 +86,7 @@ interface XResultSetMetaDataSupplier: com::sun::star::uno::XInterface
 {
 
     // DocMerge from xml: method com::sun::star::sdbc::XResultSetMetaDataSupplier::getMetaData
-    /** retrieves the number, types and properties of a ResultSet's columns.
+    /** retrieves the number, types, and properties of a ResultSet's columns.
      */
     XResultSetMetaData getMetaData() raises (SQLException);
 };
@@ -97,6 +97,9 @@ interface XResultSetMetaDataSupplier: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index 641bbfef7744..9fad57c602e2 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XResultSetUpdate.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 
 
 // DocMerge from xml: interface com::sun::star::sdbc::XResultSetUpdate
-/** provides the possiblity to write changes mode on a result set back to
+/** provides the possiblity to write changes made on a result set back to
     database.
  */
 interface XResultSetUpdate: com::sun::star::uno::XInterface
@@ -151,6 +151,9 @@ interface XResultSetUpdate: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XRow.idl b/offapi/com/sun/star/sdbc/XRow.idl
index 37429059a7e8..08493625cd81 100644
--- a/offapi/com/sun/star/sdbc/XRow.idl
+++ b/offapi/com/sun/star/sdbc/XRow.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XRow.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-16 06:40:03 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,7 +115,7 @@ interface XRow: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::container::com::sun::star::sdbc::XRow::getString
-    /** gets the value of a column in the current row as a String.
+    /** gets the value of a column in the current row as a string.
      */
     string getString([in]long columnIndex) raises (SQLException);
     //-------------------------------------------------------------------------
@@ -139,13 +139,13 @@ interface XRow: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::container::com::sun::star::sdbc::XRow::getInt
-    /** get the value of a column in the current row as a Integer.
+    /** get the value of a column in the current row as an integer.
      */
     long getInt([in]long columnIndex) raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::container::com::sun::star::sdbc::XRow::getLong
-    /** get the value of a column in the current row as a Long.
+    /** get the value of a column in the current row as a long.
      */
     hyper getLong([in]long columnIndex) raises (SQLException);
     //-------------------------------------------------------------------------
@@ -277,6 +277,9 @@ interface XRow: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.5  2001/10/16 06:40:03  oj
+    #76791# documentation added
+
     Revision 1.4  2001/03/16 16:41:35  jsc
     remove interfaceheader with uik and remove [const] in method definitions
 
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index 7c715f802cf2..4a483e460bae 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XRowSet.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@ interface XConnection;
 
 // DocMerge from xml: interface com::sun::star::sdbc::XRowSet
 /** enhances the functionality of a result set. It allows implementation of
-    a special behaviour for a result set and notifies an application on
+    a special behavior for a result set and notifies an application on
     certain row set events such as a change in its value.
 
 
@@ -112,6 +112,9 @@ interface XRowSet: XResultSet
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index 9e75145b4688..097029184cfa 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XRowSetListener.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,7 +70,7 @@
 
 // DocMerge from xml: interface com::sun::star::sdbc::XRowSetListener
 /** is used for receiving "cursorMoved", "rowChanged", and "rowSetChanged" events
-    posted by e.g. by a rowset.
+    posted by, for example, a rowset.
  */
 interface XRowSetListener: com::sun::star::lang::XEventListener
 {
@@ -100,6 +100,9 @@ interface XRowSetListener: com::sun::star::lang::XEventListener
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XRowUpdate.idl b/offapi/com/sun/star/sdbc/XRowUpdate.idl
index 692da1a7ccd8..9990097072d2 100644
--- a/offapi/com/sun/star/sdbc/XRowUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XRowUpdate.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XRowUpdate.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,13 +137,13 @@ interface XRowUpdate: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateDouble
-    /** updates a column with a Double value.
+    /** updates a column with a double value.
      */
     void updateDouble([in]long columnIndex, [in]double x) raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateString
-    /** updates a column with a String value.
+    /** updates a column with a string value.
      */
     void updateString([in]long columnIndex, [in]string x) raises (SQLException);
     //-------------------------------------------------------------------------
@@ -155,21 +155,21 @@ interface XRowUpdate: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateDate
-    /** updates a column with a Date value.
+    /** updates a column with a date value.
      */
     void updateDate([in]long columnIndex, [in]com::sun::star::util::Date x)
         raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateTime
-    /** updates a column with a Time value.
+    /** updates a column with a time value.
      */
     void updateTime([in]long columnIndex, [in]com::sun::star::util::Time x)
         raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateTimestamp
-    /** updates a column with a Timestamp value.
+    /** updates a column with a timestamp value.
      */
     void updateTimestamp([in]long columnIndex,
                          [in]com::sun::star::util::DateTime x)
@@ -193,14 +193,14 @@ interface XRowUpdate: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateObject
-    /** updates a column with an Object value.
+    /** updates a column with an object value.
      */
     void updateObject([in]long columnIndex, [in]any x)
       raises (SQLException);
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XRowUpdate::updateNumericObject
-    /** updates a column with an Object value.
+    /** updates a column with an object value.
      */
     void updateNumericObject([in]long columnIndex, [in]any x, [in]long scale)
       raises (SQLException);
@@ -212,6 +212,9 @@ interface XRowUpdate: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XSQLInput.idl b/offapi/com/sun/star/sdbc/XSQLInput.idl
index 72f7a4b3b89f..55ceb20feb12 100644
--- a/offapi/com/sun/star/sdbc/XSQLInput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLInput.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XSQLInput.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,7 +184,7 @@ interface XSQLInput: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XSQLInput::readTimestamp
-    /** reads the next attribute in the stream as DateTime.
+    /** reads the next attribute in the stream as datetime.
      */
     com::sun::star::util::DateTime readTimestamp() raises (SQLException);
     //-------------------------------------------------------------------------
@@ -259,6 +259,9 @@ interface XSQLInput: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.5  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.4  2000/12/19 13:59:40  mi
     syntax errors in documentation fixed
 
diff --git a/offapi/com/sun/star/sdbc/XStatement.idl b/offapi/com/sun/star/sdbc/XStatement.idl
index 2123271b0508..5094f6ad7524 100644
--- a/offapi/com/sun/star/sdbc/XStatement.idl
+++ b/offapi/com/sun/star/sdbc/XStatement.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XStatement.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@ interface XResultSet;
 
 
     <p>Only one ResultSet per Statement can be open at any point in
-    time. Therefore, if the reading of one ResultSet is interleaved
+    time; therefore, if the reading of one ResultSet is interleaved
     with the reading of another, each must have been generated by
     different Statements. All statement <code>execute</code> methods implicitly
     close a statement's current ResultSet if an open one exists.</p>
@@ -137,6 +137,9 @@ interface XStatement: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:43:35  mi
     moved from api
 
diff --git a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
index 8d1dd2afa564..dc6380e3690c 100644
--- a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XWarningsSupplier.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:35 $
+ *  last change: $Author: mi $ $Date: 2001-11-01 16:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 
 
 // DocMerge from xml: interface com::sun::star::sdbc::XWarningsSupplier
-/** should be implemented of objects which may report warnings or not critical
+/** should be implemented of objects which may report warnings or non critical
     errors .@see com::sun::star::sdbc::SQLWarning
  */
 interface XWarningsSupplier: com::sun::star::uno::XInterface
@@ -111,6 +111,9 @@ interface XWarningsSupplier: com::sun::star::uno::XInterface
 
 /*===========================================================================
     $Log: not supported by cvs2svn $
+    Revision 1.5  2001/03/16 16:41:35  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.4  2000/12/19 13:59:40  mi
     syntax errors in documentation fixed