INTEGRATION: CWS rptchart02 (1.2.4); FILE MERGED

2008/04/16 06:56:53 oj 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED
2008/03/12 09:13:10 oj 1.2.4.1: add mising properties

1 files changed, 30 insertions, 1 deletions

diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index ac652fdf458f..ebd2d66bc8d5 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: XDatabaseDataProvider.idl,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,9 +34,12 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 #include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/beans/UnknownPropertyException.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/sdbc/XConnection.idl>
+#include <com/sun/star/sdbc/XParameters.idl>
+#include <com/sun/star/sdbc/XRowSet.idl>
 #include <com/sun/star/chart2/data/XDataProvider.idl>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
 
@@ -75,6 +78,9 @@ interface XDatabaseDataProvider
     */
     interface com::sun::star::beans::XPropertySet;
 
+    interface com::sun::star::sdbc::XParameters;
+    interface com::sun::star::sdbc::XRowSet;
+
     /** is used for subreports and contains the names of columns of the parent report.
     <p> These columns are typically the foreign key fields of the parent report.
     The values of theses columns are used to identify the data for the subreport.
@@ -155,6 +161,29 @@ interface XDatabaseDataProvider
     */
     [attribute,bound] string Filter;
 
+    /** indicates whether the filter should be applied or not,
+        default is <FALSE/>.
+     */
+    [attribute,bound] boolean ApplyFilter;
+
+    /** additional having clause for the row set
+     */
+    [attribute,bound] string HavingClause
+    {
+        set raises (com::sun::star::beans::UnknownPropertyException);
+    };
+
+    /** additional group by for the row set
+     */
+    [attribute,bound] string GroupBy
+    {
+        set raises (com::sun::star::beans::UnknownPropertyException);
+    };
+
+    /** is a additional sort order definition for a rowset.
+     */
+    [attribute,bound] string Order;
+
     /** specifies if the <member>Command</member> should be analyzed on the client side before sending it
         to the database server.