INTEGRATION: CWS dba22b (1.9.232); FILE MERGED

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

4 files changed, 8 insertions, 42 deletions

diff --git a/offapi/com/sun/star/sdbc/XResultSet.idl b/offapi/com/sun/star/sdbc/XResultSet.idl
index aeddbc4cb05b..7076d7a6dfc4 100644
--- a/offapi/com/sun/star/sdbc/XResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XResultSet.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XResultSet.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:52:44 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:10:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,6 @@
  published interface XStatement;
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XResultSet
 /** provides the navigation on a table of data.  A
     <type scope="com::sun::star::sdbc">ResultSet</type>
     object is usually generated by executing a
@@ -66,7 +65,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::next
     /** moves the cursor down one row from its current position.
 
 
@@ -89,7 +87,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean next() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::isBeforeFirst
     /** indicates whether the cursor is before the first row in the result
         set.
         @returns
@@ -100,7 +97,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean isBeforeFirst() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::isAfterLast
     /** indicates whether the cursor is after the last row in the result
         set.
         @returns
@@ -111,7 +107,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean isAfterLast() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::isFirst
     /** indicates whether the cursor is on the first row of the result set.
         @returns
          <TRUE/> if so
@@ -121,7 +116,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean isFirst() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::isLast
     /** indicates whether the cursor is on the last row of the result set.
 
 
@@ -142,7 +136,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean isLast() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::beforeFirst
     /** moves the cursor to the front of the result set, just before the
         first row. Has no effect if the result set contains no rows.
         @throws SQLException
@@ -151,7 +144,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     void beforeFirst() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::afterLast
     /** moves the cursor to the end of the result set, just after the last
         row. Has no effect if the result set contains no rows.
         @throws SQLException
@@ -160,7 +152,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     void afterLast() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::first
     /** moves the cursor to the first row in the result set.
         @returns
          <TRUE/> if successful
@@ -170,7 +161,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean first() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::last
     /** moves the cursor to the last row in the result set.
         @returns
          <TRUE/> if successful
@@ -180,7 +170,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean last() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::getRow
     /** retrieves the current row number. The first row is number 1, the
         second number 2, and so on.
         @returns
@@ -191,7 +180,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     long getRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::absolute
     /** moves the cursor to the given row number in the result set.
 
 
@@ -230,7 +218,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean absolute([in] long row ) raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::relative
     /** moves the cursor a relative number of rows, either positive or negative.
 
 
@@ -261,7 +248,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean relative([in]long rows) raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::previous
     /** moves the cursor to the previous row in the result set.
 
 
@@ -282,7 +268,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean previous() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::refreshRow
     /** refreshes the current row with its most recent value in
         the database. Cannot be called when on the insert row.
         The
@@ -312,7 +297,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     void refreshRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::rowUpdated
     /** indicates whether the current row has been updated. The value returned
         depends on whether or not the result set can detect updates.
         @returns
@@ -323,7 +307,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean rowUpdated() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::rowInserted
     /** indicates whether the current row has had an insertion.  The value returned
         depends on whether or not the result set can detect visible inserts.
         @returns
@@ -334,7 +317,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean rowInserted() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::rowDeleted
     /** indicates whether a row has been deleted.  A deleted row may leave
         a visible "hole" in a result set.  This method can be used to
         detect holes in a result set.  The value returned depends on whether
@@ -347,7 +329,6 @@ published interface XResultSet: com::sun::star::uno::XInterface
     boolean rowDeleted() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSet::getStatement
     /** returns the Statement that produced this
         <type scope="com::sun::star::sdbc">ResultSet</type>
         object. If the result set was generated some other way, such as by an
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index fd85f432c094..188bb6f69c3e 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XResultSetUpdate.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:53:29 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:11:06 $
  *
  *  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::XResultSetUpdate
 /** provides the possiblity to write changes made on a result set back to
     database.
  */
@@ -54,7 +53,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::insertRow
     /** inserts the contents of the insert row into the result set and
         the database. Must be on the insert row when this method is called.
         @throws SQLException
@@ -63,7 +61,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
     void insertRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::updateRow
     /** updates the underlying database with the new contents of the
         current row. Cannot be called when on the insert row.
         @throws SQLException
@@ -72,7 +69,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
     void updateRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::deleteRow
     /** deletes the current row from the result set and the underlying
         database. Cannot be called when on the insert row.
         @throws SQLException
@@ -81,7 +77,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
     void deleteRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::cancelRowUpdates
     /** cancels the updates made to a row.
 
 
@@ -101,7 +96,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
     void cancelRowUpdates() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::moveToInsertRow
     /** moves the cursor to the insert row.  The current cursor position is
         remembered while the cursor is positioned on the insert row.
 
@@ -139,7 +133,6 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
     void moveToInsertRow() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XResultSetUpdate::moveToCurrentRow
     /** moves the cursor to the remembered cursor position, usually the
         current row. This method has no effect if the cursor is not on the insert
         row.
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index ddde206d1d6e..f32f10ebc50f 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRowSet.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:53:58 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:11:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,6 @@
  published interface XConnection;
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XRowSet
 /** enhances the functionality of a result set. It allows implementation of
     a special behavior for a result set and notifies an application on
     certain row set events such as a change in its value.
@@ -62,7 +61,6 @@ published interface XRowSet: XResultSet
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSet::execute
     /** populates a row set with data. The description of the data source and
         other important information for filling the row set with data.
 
@@ -72,7 +70,6 @@ published interface XRowSet: XResultSet
     void execute() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSet::addRowSetListener
     /** adds the specified listener to receive the events "cursorMoved",
         "rowChanged", and "rowSetChanged".
         @param listener
@@ -81,7 +78,6 @@ published interface XRowSet: XResultSet
     [oneway] void addRowSetListener([in]XRowSetListener listener );
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSet::removeRowSetListener
     /** removes the specified listener.
         @param listener
             the listener which should be registered
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index 35659bcae270..7c2df271b830 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRowSetListener.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:54:14 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:11:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,14 +42,12 @@
  module com {  module sun {  module star {  module sdbc {
 
 
-// DocMerge from xml: interface com::sun::star::sdbc::XRowSetListener
 /** is used for receiving "cursorMoved", "rowChanged", and "rowSetChanged" events
     posted by, for example, a rowset.
  */
 published interface XRowSetListener: com::sun::star::lang::XEventListener
 {
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSetListener::cursorMoved
     /** is called when a rowset's cursor is moved.
         @param event
             contains information about the event
@@ -57,7 +55,6 @@ published interface XRowSetListener: com::sun::star::lang::XEventListener
     [oneway] void cursorMoved([in]com::sun::star::lang::EventObject event);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSetListener::rowChanged
     /** is called when a row is inserted, updated, or deleted.
         @param event
             contains information about the event
@@ -65,7 +62,6 @@ published interface XRowSetListener: com::sun::star::lang::XEventListener
     [oneway] void rowChanged([in]com::sun::star::lang::EventObject event);
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::sdbc::XRowSetListener::rowSetChanged
     /** is called when the row set has changed, or in other words, when the row set has
         been reexecuted.
         @param event