INTEGRATION: CWS dba22b (1.8.232); FILE MERGED

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

2 files changed, 4 insertions, 11 deletions

diff --git a/offapi/com/sun/star/sdbc/XSQLData.idl b/offapi/com/sun/star/sdbc/XSQLData.idl
index 9739aa35e..f2d634a70 100644
--- a/offapi/com/sun/star/sdbc/XSQLData.idl
+++ b/offapi/com/sun/star/sdbc/XSQLData.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XSQLData.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:54:47 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:12:10 $
  *
  *  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 XSQLOutput; 
  
  
-// DocMerge from xml: interface com::sun::star::sdbc::XSQLData
 /** is used for the custom mapping of SQL user-defined types.
     
     
@@ -64,7 +63,6 @@
 published interface XSQLData: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::sdbc::XSQLData::getSQLTypeName
     /** returns the fully-qualified name of the SQL user-defined type
         that this object represents.
         
@@ -82,7 +80,6 @@ published interface XSQLData: com::sun::star::uno::XInterface
  
      //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdbc::XSQLData::readSQL
     /** populates this object with data read from the database.
         
         
@@ -124,7 +121,6 @@ published interface XSQLData: com::sun::star::uno::XInterface
         raises (SQLException); 
     //------------------------------------------------------------------------- 
        
-    // DocMerge from xml: method com::sun::star::sdbc::XSQLData::writeSQL
     /** writes this object to the given SQL data stream.
         
         
diff --git a/offapi/com/sun/star/sdbc/XStruct.idl b/offapi/com/sun/star/sdbc/XStruct.idl
index 29568144c..0e84d978c 100644
--- a/offapi/com/sun/star/sdbc/XStruct.idl
+++ b/offapi/com/sun/star/sdbc/XStruct.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XStruct.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:55:53 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:12:56 $
  *
  *  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::container::com::sun::star::sdbc::XStruct
 /** is used for the standard mapping for a SQL structured type.
     
     
@@ -68,7 +67,6 @@
 published interface XStruct: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::container::com::sun::star::sdbc::XStruct::getSQLTypeName
     /** retrieves the SQL type name of the SQL structured type
         that this 
         <code>Struct</code>
@@ -82,7 +80,6 @@ published interface XStruct: com::sun::star::uno::XInterface
  
       //------------------------------------------------------------------------- 
      
-    // DocMerge from idl: method com::sun::star::container::com::sun::star::sdbc::XStruct::getAttributes
     /** produces the ordered values of the attributes of the SQL 
              structured type that this 
              <code>Struct</code>