INTEGRATION: CWS dba22b (1.9.232); FILE MERGED

2006/12/12 09:27:58 fs 1.9.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/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index 46cfc9095587..9bf8d4f46756 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DatabaseContext.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:16:24 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:51:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -57,7 +57,6 @@
 
  module com {  module sun {  module star {  module sdb {
 
-// DocMerge from xml: service com::sun::star::sdb::DatabaseContext
 /** is the context for accessing datasource.
 
     <p>
@@ -72,13 +71,11 @@
 published service DatabaseContext
 {
 
-    // DocMerge from xml: service com::sun::star::sdb::DatabaseContext: interface com::sun::star::container::XEnumerationAccess
     /** Enumeration on all registered data sources.
      */
     interface com::sun::star::container::XEnumerationAccess;
 
 
-    // DocMerge from xml: service com::sun::star::sdb::DatabaseContext: interface com::sun::star::container::XNameAccess
     /** NameAccess on all registered data sources.
         <p>One exception is the <method "com.sun.star.container.XNameAccess">getByName</method>, this method also allows to ask
         for a <member "DataAccessDescriptor">DatabaseLocation</member>.
@@ -86,7 +83,6 @@ published service DatabaseContext
      */
     interface com::sun::star::container::XNameAccess;
 
-    // DocMerge from xml: service com::sun::star::sdb::DatabaseContext: interface com::sun::star::uno::XNamingService
     /** Interface for registering new datasources.
      */
     interface com::sun::star::uno::XNamingService;
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 6328a30bd7fc..b622b80f38b9 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DatabaseDocument.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:16:40 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:51:16 $
  *
  *  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 sdb {
 
-// DocMerge from xml: service com::sun::star::sdbcx::com::sun::star::sdb::DatabaseDocument
 /** specifies documents which belong to a database access bean.
 
     <p>
@@ -72,13 +71,11 @@ published service DatabaseDocument
     // allows to rename the object.
     interface com::sun::star::sdbcx::XRename;
 
-    // DocMerge from xml: property com::sun::star::sdbcx::com::sun::star::sdb::DatabaseDocument::Name
     /** is the name of the document.
      */
     [readonly, property] string Name;
 
 
-    // DocMerge from xml: property com::sun::star::sdbcx::com::sun::star::sdb::DatabaseDocument::URL
     /** is the URL of the document.
      */
     [readonly, property] string URL;