INTEGRATION: CWS dba22b (1.6.232); FILE MERGED

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

2 files changed, 4 insertions, 12 deletions

diff --git a/offapi/com/sun/star/sdbcx/KeyType.idl b/offapi/com/sun/star/sdbcx/KeyType.idl
index 84923f397757..5f3f4d9d8b5d 100644
--- a/offapi/com/sun/star/sdbcx/KeyType.idl
+++ b/offapi/com/sun/star/sdbcx/KeyType.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: KeyType.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:01:02 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:17:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,25 +38,21 @@
  module com {  module sun {  module star {  module sdbcx {
 
 
-// DocMerge from idl: constants com::sun::star::sdbcx::KeyType
 /** determines the type of a key.
  */
 published constants KeyType
 {
 
-    // DocMerge from idl: value com::sun::star::sdbcx::KeyType::PRIMARY
     /** indicates that the key is the primary key of a table.
      */
     const long PRIMARY  = 1;
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::sdbcx::KeyType::UNIQUE
     /** indicates that the key is unique, NULL values are allowed.
      */
     const long UNIQUE = 2;
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::sdbcx::KeyType::FOREIGN
     /** indicates that the key is a foreign key of a table.
      */
     const long FOREIGN = 3;
diff --git a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
index 7e0143ac3167..7d969d53ee06 100644
--- a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
+++ b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PrivilegeObject.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:01:42 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 14:17:30 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,26 +38,22 @@
  module com {  module sun {  module star {  module sdbcx {
 
 
-// DocMerge from idl: constants com::sun::star::sdbcx::PrivilegeObject
 /** defines the list of objects for which a user may have accessrights or not.
         This list may grow in the future.
  */
 published constants PrivilegeObject
 {
 
-    // DocMerge from idl: value com::sun::star::sdbcx::PrivilegeObject::TABLE
     /** indicates a table.
      */
     const long TABLE    = 0;
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::sdbcx::PrivilegeObject::VIEW
     /** indicates a view.
      */
     const long VIEW     = 1;
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::sdbcx::PrivilegeObject::COLUMN
     /** indicates a column of a table.
      */
     const long COLUMN   = 2;