rebase XDatabaseDataProvider

Change-Id: Iacb4b5f52eae6b434a2f95d497995dfae400fc9b

2 files changed, 19 insertions, 55 deletions

diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
deleted file mode 100644
index 95dff79b8765..000000000000
--- a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
-#define __com_sun_star_report_DatabaseDataProvider_idl__
-
-#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
-
-
- module com {  module sun {  module star {  module chart2 { module data {
-
-
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
-
- }; }; }; };  };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 9e625d9e090e..57a4f41ad082 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,10 +15,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XDatabaseDataProvider_idl__
 #define __com_sun_star_report_XDatabaseDataProvider_idl__
 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #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>
@@ -30,9 +32,11 @@
 #include <com/sun/star/chart2/data/XDataProvider.idl>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
 
+//=============================================================================
 
  module com {  module sun {  module star {  module chart2 { module data {
 
+//=============================================================================
 
 /** identifies a <type>XDataProvider</type> for result sets.
 
@@ -80,7 +84,7 @@ interface XDatabaseDataProvider
     /**is used for subreports and contains the names of the columns of the subreport
     which are related to the master fields of the parent report.
     <p>Entries in this sequence can either denote column names in the sub report,
-    or parameter names.<br/>
+    or paramater names.<br/>
     For instance, you could base the report on the SQL statement
     <code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
     to the DetailFields property. In this case, the parameter will be filled from
@@ -92,7 +96,7 @@ interface XDatabaseDataProvider
     master field.<br/>
     If a string in this property denotes both a column name and a parameter name, it
     is undefined which way it is interpreted, but implementations of the service are required
-    to either decide for the parameter or the column, and proceed as usual.
+    to either decide for the paramter or the column, and proceed as usual.
     </p>
     <p>The columns specified herein typically represent a part of the primary key
     fields or their aliases of the detail report.</p>
@@ -123,14 +127,14 @@ interface XDatabaseDataProvider
 
         <p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
 
-        <p>This property is only meaningful together with the <member>Command</member>
+        <p>This property is only meaningfull together with the <member>Command</member>
         property, thus either <em>both</em> or <em>none</em> of them are present.</p>
 
         @see com::sun::star::sdb::CommandType
      */
     [attribute,bound] long CommandType;
 
-    /** specifies an additional filter to optionally use.
+    /** specifies an addtional filter to optinally use.
 
         <p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
 
@@ -165,7 +169,7 @@ interface XDatabaseDataProvider
         set raises (com::sun::star::beans::UnknownPropertyException);
     };
 
-    /** is a additional sort order definition for a row set.
+    /** is a additional sort order definition for a rowset.
      */
     [attribute,bound] string Order;
 
@@ -192,15 +196,21 @@ interface XDatabaseDataProvider
     {
         set raises (com::sun::star::lang::IllegalArgumentException);
     };
-    /** is the name of the data source to use, this could be a named data source
+    /** is the name of the datasource to use, this could be a named datasource
         or the URL of a data access component.
      */
     [attribute,bound] string DataSourceName;
 };
 
+service DatabaseDataProvider : XDatabaseDataProvider
+{
+    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
+};
+//=============================================================================
 
  }; }; }; };  };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif