INTEGRATION: CWS dba22b (1.8.232); FILE MERGED

2006/12/12 09:22:19 fs 1.8.232.1: removed useless 'DocMerge from ...' comments which disturb grepping for identifiers

4 files changed, 8 insertions, 22 deletions

diff --git a/offapi/com/sun/star/sdbc/XOutParameters.idl b/offapi/com/sun/star/sdbc/XOutParameters.idl
index 11bc8dde8f79..e4c2414ba6f3 100644
--- a/offapi/com/sun/star/sdbc/XOutParameters.idl
+++ b/offapi/com/sun/star/sdbc/XOutParameters.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XOutParameters.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:51:18 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:08:50 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,6 @@
  module com {  module sun {  module star {  module sdbc {
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XOutParameters
 /** is used to register Out-Parameters for stored procedures.
 
 
@@ -62,7 +61,6 @@
 published interface XOutParameters: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbc::XOutParameters::registerOutParameter
     /** registers the designated output parameter.  This version of
         the method
         <member scope="com::sun::star::sdbc">XOutParameters::registerOutParameter()</member>
@@ -112,7 +110,6 @@ published interface XOutParameters: com::sun::star::uno::XInterface
         raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XOutParameters::registerNumericOutParameter
     /** registers the OUT parameter in ordinal position
         <code>parameterIndex</code>
         to the SDBC type
diff --git a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
index 270837417182..bc55d485be8a 100644
--- a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XPreparedBatchExecution.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:51:59 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:09:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,6 @@
  module com {  module sun {  module star {  module sdbc {
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XPreparedBatchExecution
 /** is used for batch execution on PreparedStatements.
 
 
@@ -61,7 +60,6 @@
 published interface XPreparedBatchExecution: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedBatchExecution::addBatch
     /** adds a set of parameters to the batch.
         @throws SQLException
             if a database access error occurs.
@@ -69,7 +67,6 @@ published interface XPreparedBatchExecution: com::sun::star::uno::XInterface
     void addBatch() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedBatchExecution::clearBatch
     /** makes the set of commands in the current batch empty.
         @throws SQLException
             if a database access error occurs.
@@ -77,7 +74,6 @@ published interface XPreparedBatchExecution: com::sun::star::uno::XInterface
     void clearBatch() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::sdbc::XPreparedBatchExecution::executeBatch
     /** submits a batch of commands to the database for execution.
              @returns
                 an array of update counts containing one element for each
diff --git a/offapi/com/sun/star/sdbc/XPreparedStatement.idl b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
index 1635f484fd31..fa594567bf82 100644
--- a/offapi/com/sun/star/sdbc/XPreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XPreparedStatement.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:52:14 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:09:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,7 +49,6 @@
  published interface XResultSet;
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XPreparedStatement
 /** provides the possibilty of executing a precompiled SQL statement.
 
 
@@ -62,7 +61,6 @@
 published interface XPreparedStatement: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedStatement::executeQuery
     /** executes the SQL query in this
         <code>PreparedStatement</code>
         object and returns the result set generated by the query.
@@ -74,7 +72,6 @@ published interface XPreparedStatement: com::sun::star::uno::XInterface
     XResultSet executeQuery() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedStatement::executeUpdate
     /** executes the SQL INSERT, UPDATE or DELETE statement in this
         <type scope="com::sun::star::sdbc">PreparedStatement</type>
         object.
@@ -89,7 +86,6 @@ published interface XPreparedStatement: com::sun::star::uno::XInterface
     long executeUpdate() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedStatement::execute
     /** executes any kind of SQL statement.
 
 
@@ -106,7 +102,6 @@ published interface XPreparedStatement: com::sun::star::uno::XInterface
     boolean execute() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XPreparedStatement::getConnection
     /** returns the
         <type scope="com::sun::star::sdbc">Connection</type>
         object
diff --git a/offapi/com/sun/star/sdbc/XRef.idl b/offapi/com/sun/star/sdbc/XRef.idl
index 5f149d03b069..ad3713080dfc 100644
--- a/offapi/com/sun/star/sdbc/XRef.idl
+++ b/offapi/com/sun/star/sdbc/XRef.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRef.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:52:29 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:10:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,6 @@
  module com {  module sun {  module star {  module sdbc {
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XRef
 /** is the reference to a SQL structured type value in the database.  A
     Ref can be saved to persistent storage.  A Ref is dereferenced by
     passing it as a parameter to a SQL statement and executing the
@@ -56,7 +55,6 @@ published interface XRef: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRef::getBaseTypeName
     /** gets the fully-qualified SQL structured type name of the referenced item.
         @returns
             the base type name