INTEGRATION: CWS dba22b (1.8.232); FILE MERGED

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

4 files changed, 8 insertions, 30 deletions

diff --git a/offapi/com/sun/star/sdbc/TransactionIsolation.idl b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
index e75b6879d..3f0f17ed8 100644
--- a/offapi/com/sun/star/sdbc/TransactionIsolation.idl
+++ b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: TransactionIsolation.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:47:16 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:05:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,18 +38,15 @@
  module com {  module sun {  module star {  module sdbc { 
  
  
-// DocMerge from idl: constants com::sun::star::sdbc::TransactionIsolation
 /** distinguishes different possible transaction isolation levels.
  */
 published constants TransactionIsolation
 { 
      
-    // DocMerge from idl: value com::sun::star::sdbc::TransactionIsolation::NONE
     /** indicates that transactions are not supported.
      */
     const long NONE					=  0; 
      
-    // DocMerge from idl: value com::sun::star::sdbc::TransactionIsolation::READ_UNCOMMITTED
     /** Dirty reads, non-repeatable reads and phantom reads can occur. 
              This level allows a row changed by one transaction to be read 
              by another transaction before any changes in that row have been 
@@ -58,14 +55,12 @@ published constants TransactionIsolation
      */
     const long READ_UNCOMMITTED 	=  1; 
      
-    // DocMerge from idl: value com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED
     /** Dirty reads are prevented; non-repeatable reads and phantom 
              reads can occur.  This level only prohibits a transaction 
              from reading a row with uncommitted changes in it.
      */
     const long READ_COMMITTED		=  2; 
      
-    // DocMerge from idl: value com::sun::star::sdbc::TransactionIsolation::REPEATABLE_READ
     /** Dirty reads and non-repeatable reads are prevented; phantom 
              reads can occur.  This level prohibits a transaction from 
              reading a row with uncommitted changes in it, and it also 
@@ -76,7 +71,6 @@ published constants TransactionIsolation
      */
     const long REPEATABLE_READ 		=  4; 
      
-    // DocMerge from idl: value com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE
     /** Dirty reads, non-repeatable reads and phantom reads are prevented. 
              This level includes the prohibitions in 
              <code>REPEATABLE_READ</code>
diff --git a/offapi/com/sun/star/sdbc/XBatchExecution.idl b/offapi/com/sun/star/sdbc/XBatchExecution.idl
index 03b335dc8..08843b0e8 100644
--- a/offapi/com/sun/star/sdbc/XBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XBatchExecution.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XBatchExecution.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:47:54 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:06:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,13 +48,11 @@
  published interface XResultSet; 
  
  
-// DocMerge from xml: interface com::sun::star::sdbc::XBatchExecution
 /** is used for collecting and executing a set of SQL statements.
  */
 published interface XBatchExecution: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::sdbc::XBatchExecution::addBatch
     /** adds a SQL command to the current batch of commmands for the statement
         object.
         @param sql
@@ -66,7 +64,6 @@ published interface XBatchExecution: com::sun::star::uno::XInterface
     void addBatch([in]string sql ) raises (SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdbc::XBatchExecution::clearBatch
     /** makes the set of commands in the current batch empty.
         @throws SQLException 
             if a database access error occurs.
@@ -74,7 +71,6 @@ published interface XBatchExecution: com::sun::star::uno::XInterface
     void clearBatch() raises (SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from idl: method com::sun::star::sdbc::XBatchExecution::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/XBlob.idl b/offapi/com/sun/star/sdbc/XBlob.idl
index f72d70112..11b76713c 100644
--- a/offapi/com/sun/star/sdbc/XBlob.idl
+++ b/offapi/com/sun/star/sdbc/XBlob.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XBlob.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:48:08 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:06:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,6 @@
  module com {  module sun {  module star {  module sdbc { 
  
  
-// DocMerge from xml: interface com::sun::star::io::com::sun::star::sdbc::XBlob
 /** is the representation (mapping) of an SQL 
     <i>
     BLOB
@@ -121,7 +120,6 @@ published interface XBlob: com::sun::star::uno::XInterface
 { 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XBlob::length
     /** returns the number of bytes in the 
         <i>
         BLOB
@@ -139,7 +137,6 @@ published interface XBlob: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from idl: method com::sun::star::io::com::sun::star::sdbc::XBlob::getBytes
     /** returns as an array of bytes part or all of the
             <i>
             BLOB
@@ -186,7 +183,6 @@ published interface XBlob: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XBlob::getBinaryStream
     /** retrieves the 
         <i>
         BLOB
@@ -203,7 +199,6 @@ published interface XBlob: com::sun::star::uno::XInterface
         raises (SQLException); 
       //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XBlob::position
     /** determines the byte position at which the specified byte
         <code>pattern</code>
         begins within the 
@@ -230,7 +225,6 @@ published interface XBlob: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XBlob::positionOfBlob
     /** determines the byte position in the 
         <i>
         BLOB
diff --git a/offapi/com/sun/star/sdbc/XClob.idl b/offapi/com/sun/star/sdbc/XClob.idl
index 7d0aa1ebb..c9a929487 100644
--- a/offapi/com/sun/star/sdbc/XClob.idl
+++ b/offapi/com/sun/star/sdbc/XClob.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XClob.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:48:23 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:06:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,6 @@
  module com {  module sun {  module star {  module sdbc { 
  
  
-// DocMerge from xml: interface com::sun::star::io::com::sun::star::sdbc::XClob
 /** is the mapping for the SQL 
     <code>CLOB</code>
     type.
@@ -113,7 +112,6 @@ published interface XClob: com::sun::star::uno::XInterface
 { 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XClob::length
     /** returns the number of characters in the 
         <code>CLOB</code>
         value
@@ -129,7 +127,6 @@ published interface XClob: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XClob::getSubString
     /** returns a copy of the specified substring in the 
         <code>Clob</code>
         value
@@ -157,7 +154,6 @@ published interface XClob: com::sun::star::uno::XInterface
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XClob::getCharacterStream
     /** gets the 
         <code>Clob</code>
         contents as a stream.
@@ -170,7 +166,6 @@ published interface XClob: com::sun::star::uno::XInterface
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XClob::position
     /** determines the character position at which the specified substring
         <code>searchstr</code>
         appears in the 
@@ -192,7 +187,6 @@ published interface XClob: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::io::com::sun::star::sdbc::XClob::positionOfClob
     /** determines the position at which the specified
         <code>Clob</code>
         object