INTEGRATION: CWS dba22b (1.9.232); FILE MERGED

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

4 files changed, 8 insertions, 16 deletions

diff --git a/offapi/com/sun/star/sdbcx/XRename.idl b/offapi/com/sun/star/sdbcx/XRename.idl
index 786179a3f73e..bbbf6182e7cb 100644
--- a/offapi/com/sun/star/sdbcx/XRename.idl
+++ b/offapi/com/sun/star/sdbcx/XRename.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRename.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:07:21 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:22:36 $
  *
  *  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 @@
 
  module com {  module sun {  module star {  module sdbcx {
 
-// DocMerge from xml: interface com::sun::star::sdbcx::XRename
 /** supports the renaming of definition objects.
     <br/>
 
@@ -59,7 +58,6 @@
 published interface XRename: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbcx::XRename::rename
     /** is intended to alter the name of a object.
         @param newName
             the new name
diff --git a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
index b8331283c011..bfeb69540be1 100644
--- a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XTablesSupplier.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:07:52 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:23:04 $
  *
  *  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 sdbcx {
 
 
-// DocMerge from xml: interface com::sun::star::sdbcx::XTablesSupplier
 /** provides for access to a container of tables, typically used for a database
     definition object.
  */
 published interface XTablesSupplier: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbcx::XTablesSupplier::getTables
     /** returns the container of tables.
         @returns
             the tables
diff --git a/offapi/com/sun/star/sdbcx/XUser.idl b/offapi/com/sun/star/sdbcx/XUser.idl
index e88d1b8d8c57..6262b2c4258e 100644
--- a/offapi/com/sun/star/sdbcx/XUser.idl
+++ b/offapi/com/sun/star/sdbcx/XUser.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XUser.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:08:14 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:23:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,13 +41,11 @@
 
  module com {  module sun {  module star {  module sdbcx {
 
-// DocMerge from xml: interface com::sun::star::sdbcx::XUser
 /** allows for changing a users password.
  */
 published interface XUser: XAuthorizable
 {
 
-    // DocMerge from xml: method com::sun::star::sdbcx::XUser::changePassword
     /** allows modifying a user password.
         @param oldPassword
             the old password to be reset
diff --git a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
index a0770e4ffa9c..df26fa4b8b35 100644
--- a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XViewsSupplier.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:08:45 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:23:41 $
  *
  *  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 sdbcx {
 
 
-// DocMerge from xml: interface com::sun::star::sdbcx::XViewsSupplier
 /** provides for access to a container of views, typically used for a database
     definition object.
  */
 published interface XViewsSupplier: com::sun::star::uno::XInterface
 {
 
-    // DocMerge from xml: method com::sun::star::sdbcx::XViewsSupplier::getViews
     /** returns the container of views.
         @returns
             the views