INTEGRATION: CWS dba22b (1.9.232); FILE MERGED

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

4 files changed, 8 insertions, 28 deletions

diff --git a/offapi/com/sun/star/sdbcx/ResultSet.idl b/offapi/com/sun/star/sdbcx/ResultSet.idl
index 4b38b3bd6..20de2dbe0 100644
--- a/offapi/com/sun/star/sdbcx/ResultSet.idl
+++ b/offapi/com/sun/star/sdbcx/ResultSet.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ResultSet.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:02:09 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:17:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,17 +45,14 @@
  published interface XDeleteRows; 
  
  
-// DocMerge from xml: service com::sun::star::sdbcx::ResultSet
 /** extends the SDBC ResultSet by the possibility of bookmark positioning, cancelling
     the positioning, and updating of rows.
  */
 published service ResultSet
 { 
-    // DocMerge: empty anyway
     service com::sun::star::sdbc::ResultSet; 
  
      
-    // DocMerge from xml: service com::sun::star::sdbcx::ResultSet: interface com::sun::star::util::XCancellable
     /** could be used for cancelling the execution of SQL statements if both 
  the DBMS and the driver support aborting of navigation commands. 
  The implementation is optional.
@@ -63,26 +60,22 @@ published service ResultSet
     [optional] interface com::sun::star::util::XCancellable; 
  
      
-    // DocMerge from xml: service com::sun::star::sdbcx::ResultSet: interface com::sun::star::sdbcx::XRowLocate
     /** is the interface for navigating on the result set by unique bookmarks.
      */
     interface XRowLocate; 
  
      
-    // DocMerge from xml: service com::sun::star::sdbcx::ResultSet: interface com::sun::star::sdbcx::XDeleteRows
     /** is the interface for deleting more than one row, identified by it's bookmark. 
               The implementation is optional.
      */
     [optional] interface XDeleteRows; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::ResultSet::IsBookmarkable
     /** returns if the resultset supports bookmark navigation.
      */
     [readonly, property] boolean IsBookmarkable; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::ResultSet::CanUpdateInsertedRows
     /** returns whether the resultset supports updating of newly inserted rows.
         This may not work, as the result set may contain automatic generated data
         which is used as key information.
diff --git a/offapi/com/sun/star/sdbcx/Statement.idl b/offapi/com/sun/star/sdbcx/Statement.idl
index 338168c9c..123065dfc 100644
--- a/offapi/com/sun/star/sdbcx/Statement.idl
+++ b/offapi/com/sun/star/sdbcx/Statement.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Statement.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:02:30 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:18:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,6 @@
  module com {  module sun {  module star {  module sdbcx { 
  
  
-// DocMerge from xml: service com::sun::star::sdbcx::Statement
 /** extends the definition of the service 
     <type scope="com::sun::star::sdbc">Statement</type>
     with a flag for the usage of bookmarks.
@@ -51,11 +50,9 @@
  */
 published service Statement
 { 
-    // DocMerge: empty anyway
     service com::sun::star::sdbc::Statement; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::Statement::UseBookmarks
     /** returns 
         <TRUE/>
         if a resultset should allow navigation with bookmarks or not. 
diff --git a/offapi/com/sun/star/sdbcx/TableDescriptor.idl b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
index b4abbe771..66b733564 100644
--- a/offapi/com/sun/star/sdbcx/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: TableDescriptor.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:02:59 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:18:43 $
  *
  *  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 XKeysSupplier; 
  
  
-// DocMerge from xml: service com::sun::star::sdbcx::TableDescriptor
 /** is used to define a table of a database. A table is described by its
     name and one or more columns and the keys for semantic rules.
     
@@ -61,33 +60,27 @@
 published service TableDescriptor
 { 
      
-    // DocMerge from xml: service com::sun::star::sdbcx::TableDescriptor: interface com::sun::star::sdbcx::XColumnsSupplier
     /** access to the contained table columns.
      */
     interface XColumnsSupplier; 
  
      
-    // DocMerge from xml: service com::sun::star::sdbcx::TableDescriptor: interface com::sun::star::sdbcx::XKeysSupplier
     /** optional, provides the access to the table keys.
      */
     [optional] interface XKeysSupplier;	 
  
-    // DocMerge: empty anyway
     service Descriptor; 
      
-    // DocMerge from xml: property com::sun::star::sdbcx::TableDescriptor::CatalogName
     /** is the name of the table catalog.
      */
     [property] string CatalogName; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::TableDescriptor::SchemaName
     /** is the name of the table schema.
      */
     [property] string SchemaName; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::TableDescriptor::Description
     /** supplies a comment on the table, Could be emtpy if not supported by
         the driver.
      */
diff --git a/offapi/com/sun/star/sdbcx/User.idl b/offapi/com/sun/star/sdbcx/User.idl
index 1efeaa9bf..9faab2fc0 100644
--- a/offapi/com/sun/star/sdbcx/User.idl
+++ b/offapi/com/sun/star/sdbcx/User.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: User.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:03:13 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:19:03 $
  *
  *  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 XUser; 
  
  
-// DocMerge from xml: service com::sun::star::sdbcx::User
 /** represents a user of the database, who has certain access rights 
     for the objects of the database.
  */
@@ -54,7 +53,6 @@ published service User
     // used to change the password.
     interface XUser; 
      
-    // DocMerge from xml: service com::sun::star::sdbcx::User: interface com::sun::star::sdbcx::XGroupsSupplier
     /** optional for implementation, if the database does not know the concept 
              of user groups. Provides for access to the groups to which a user belongs.
      */
@@ -64,7 +62,6 @@ published service User
     interface com::sun::star::beans::XPropertySet; 
  
      
-    // DocMerge from xml: property com::sun::star::sdbcx::User::Name
     /** is the name of the user.
      */
     [readonly, property] string Name;