INTEGRATION: CWS dba22b (1.8.232); FILE MERGED

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

3 files changed, 6 insertions, 13 deletions

diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index 3343cf914..def0621c6 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRowSetSupplier.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:30:59 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:58:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,14 +47,12 @@
  
 //============================================================================= 
  
-// DocMerge from xml: interface com::sun::star::sdb::XRowSetSupplier
 /** uses a row set as datasource.
  */
 published interface XRowSetSupplier: com::sun::star::uno::XInterface
 { 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetSupplier::getRowSet
     /** provides access to the data source.
         @returns
             the RowSet object
@@ -63,7 +61,6 @@ published interface XRowSetSupplier: com::sun::star::uno::XInterface
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetSupplier::setRowSet
     /** sets the data source.
         @param xDataSource
             the RowSet object to set
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 9f4776b8a..e692e5a6c 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XSQLErrorListener.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:31:29 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:58:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,14 +46,12 @@
  module com {  module sun {  module star {  module sdb { 
  
  
-// DocMerge from xml: interface com::sun::star::sdb::XSQLErrorListener
 /** the listener interface for receiving "errorOccured" events
     posted by any database object.
  */
 published interface XSQLErrorListener: com::sun::star::lang::XEventListener
 { 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLErrorListener::errorOccured
     /** invoked when a database error occurs, just before a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         is thrown to the application.
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 16c26b06e..9b5e1fa6c 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XSQLQueryComposerFactory.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:31:57 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:59:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,7 +44,6 @@
  
 //============================================================================= 
  
-// DocMerge from xml: interface com::sun::star::sdb::XSQLQueryComposerFactory
 /** is a factory for instances of service 
     <type scope="com::sun::star::sdb">SQLQueryComposer</type>
     .
@@ -52,7 +51,6 @@
 published interface XSQLQueryComposerFactory: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposerFactory::createQueryComposer
     /** creates a new query composer.
         @returns
             the SQLQueryComposer object