INTEGRATION: CWS dba22b (1.9.232); FILE MERGED

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

3 files changed, 6 insertions, 24 deletions

diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 3c2320d2f..983c6a5f9 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRowSetApproveBroadcaster.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:30:30 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:57:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,14 +44,12 @@
  published interface XRowSetApproveListener; 
  
  
-// DocMerge from xml: interface com::sun::star::sdb::XRowSetApproveBroadcaster
 /** provides the possibility of reviving an event before changing the content
     of a rowset.
  */
 published interface XRowSetApproveBroadcaster: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetApproveBroadcaster::addRowSetApproveListener
     /** adds the specified listener to receive the events "approveCursorMove",
         "approveRowChange", and "appproveRowSetChange".
         @param com::sun::star::sdb::XRowSetApproveListener
@@ -60,7 +58,6 @@ published interface XRowSetApproveBroadcaster: com::sun::star::uno::XInterface
             [in]XRowSetApproveListener listener ); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetApproveBroadcaster::removeRowSetApproveListener
     /** removes the specified listener.
         @param com::sun::star::sdb::XRowSetApproveListener
      */
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index 0e9bb8840..5190eafcf 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XRowSetApproveListener.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:30:44 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:57:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,13 +46,11 @@
  module com {  module sun {  module star {  module sdb { 
  
  
-// DocMerge from xml: interface com::sun::star::sdb::XRowSetApproveListener
 /** is used for approving the moving and changing of rowset actions.
  */
 published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
 { 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetApproveListener::approveCursorMove
     /** is called before a rowset's cursor is moved.
         @param event
             the event which happend
@@ -61,7 +59,6 @@ published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
     boolean approveCursorMove([in]com::sun::star::lang::EventObject event); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetApproveListener::approveRowChange
     /** is called before a row is inserted, updated, or deleted.
         @param event
             the event which happend
@@ -70,7 +67,6 @@ published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
     boolean approveRowChange([in]RowChangeEvent event); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XRowSetApproveListener::approveRowSetChange
     /** is called before a rowset is changed, or in other words
         before a rowset is reexecuted.
         @param event
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index 886ff877e..adceba4db 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XSQLQueryComposer.idl,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:31:42 $
+ *  last change: $Author: vg $ $Date: 2007-01-15 13:58:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,6 @@
  
 //============================================================================= 
  
-// DocMerge from xml: interface com::sun::star::sdb::XSQLQueryComposer
 /** should be provided by a tool which simplifies the handling with SQL select statements.
     
     <p>
@@ -64,7 +63,6 @@
 published interface XSQLQueryComposer: com::sun::star::uno::XInterface
 { 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::getQuery
     /** returns the query used for composing.
         @returns
             the query
@@ -72,7 +70,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
     string getQuery(); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::setQuery
     /** sets a new query for the composer, which may be expanded by filters
         and sort criteria.
         @param command
@@ -84,7 +81,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::getComposedQuery
     /** returns the query composed with filters and sort criterias.
         @returns
             the composed query
@@ -92,7 +88,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
     string getComposedQuery(); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::getFilter
     /** returns the currently used filter.
         
         <p>
@@ -105,7 +100,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
     string getFilter(); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from idl: method com::sun::star::sdb::XSQLQueryComposer::getStructuredFilter
     /** returns the currently used filter. 
              <p>
              The filter criteria is split into levels. Each level represents the 
@@ -120,7 +114,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
         getStructuredFilter(); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::getOrder
     /** returns the currently used sort order.
         
         
@@ -134,7 +127,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
     string getOrder(); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::appendFilterByColumn
     /** appends a new filter condition by a 
         <type scope="com::sun::star::sdb">DataColumn</type>
         providing the name and the value for the filter.
@@ -147,7 +139,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::appendOrderByColumn
     /** appends an additional part to the sort order criteria of the select
         statement.
         @param column
@@ -162,7 +153,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::setFilter
     /** makes it possible to set a filter condition	for the query.
         @param filter
             the filter to set
@@ -173,7 +163,6 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException); 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: method com::sun::star::sdb::XSQLQueryComposer::setOrder
     /** makes it possibile to set a sort condition for the query.
         @param order
             the order part to set