summaryrefslogtreecommitdiffstats
path: root/offapi/com/sun/star/sdb
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
commit45e7a5b78c29ebc5bd43ba65d1b02cb4457be613 (patch)
treee35eb3316b7f97bf0126b74d8816fdaabbc727e8 /offapi/com/sun/star/sdb
parentLibreOffice-3.5 development started in master (diff)
downloadcore-45e7a5b78c29ebc5bd43ba65d1b02cb4457be613.tar.gz
core-45e7a5b78c29ebc5bd43ba65d1b02cb4457be613.zip
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/sdb')
-rw-r--r--offapi/com/sun/star/sdb/CallableStatement.idl4
-rw-r--r--offapi/com/sun/star/sdb/Column.idl4
-rw-r--r--offapi/com/sun/star/sdb/ColumnDescriptorControl.idl2
-rw-r--r--offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl2
-rw-r--r--offapi/com/sun/star/sdb/ColumnSettings.idl2
-rw-r--r--offapi/com/sun/star/sdb/Connection.idl6
-rw-r--r--offapi/com/sun/star/sdb/ContentLoader.idl2
-rw-r--r--offapi/com/sun/star/sdb/DataAccessDescriptor.idl11
-rw-r--r--offapi/com/sun/star/sdb/DataColumn.idl2
-rw-r--r--offapi/com/sun/star/sdb/DataSettings.idl7
-rw-r--r--offapi/com/sun/star/sdb/DataSource.idl10
-rw-r--r--offapi/com/sun/star/sdb/DataSourceBrowser.idl10
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccess.idl6
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessConnection.idl6
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessContext.idl8
-rw-r--r--offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl11
-rw-r--r--offapi/com/sun/star/sdb/DatabaseContext.idl10
-rw-r--r--offapi/com/sun/star/sdb/DatabaseDocument.idl4
-rw-r--r--offapi/com/sun/star/sdb/DatabaseEnvironment.idl4
-rw-r--r--offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl11
-rw-r--r--offapi/com/sun/star/sdb/Document.idl2
-rw-r--r--offapi/com/sun/star/sdb/DocumentContainer.idl4
-rw-r--r--offapi/com/sun/star/sdb/DocumentDataSource.idl6
-rw-r--r--offapi/com/sun/star/sdb/DocumentDefinition.idl4
-rw-r--r--offapi/com/sun/star/sdb/DocumentSaveRequest.idl4
-rw-r--r--offapi/com/sun/star/sdb/ErrorMessageDialog.idl11
-rw-r--r--offapi/com/sun/star/sdb/Forms.idl2
-rw-r--r--offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl12
-rw-r--r--offapi/com/sun/star/sdb/OrderColumn.idl2
-rw-r--r--offapi/com/sun/star/sdb/ParametersRequest.idl6
-rw-r--r--offapi/com/sun/star/sdb/PreparedStatement.idl2
-rw-r--r--offapi/com/sun/star/sdb/Query.idl6
-rw-r--r--offapi/com/sun/star/sdb/QueryDefinition.idl2
-rw-r--r--offapi/com/sun/star/sdb/QueryDescriptor.idl4
-rw-r--r--offapi/com/sun/star/sdb/QueryDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/RelationDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/Reports.idl2
-rw-r--r--offapi/com/sun/star/sdb/ResultColumn.idl4
-rw-r--r--offapi/com/sun/star/sdb/ResultSet.idl2
-rw-r--r--offapi/com/sun/star/sdb/RowChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/sdb/RowSet.idl8
-rw-r--r--offapi/com/sun/star/sdb/RowSetVetoException.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLContext.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/sdb/SQLQueryComposer.idl2
-rw-r--r--offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl2
-rw-r--r--offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl4
-rw-r--r--offapi/com/sun/star/sdb/Table.idl4
-rw-r--r--offapi/com/sun/star/sdb/TableDescriptor.idl4
-rw-r--r--offapi/com/sun/star/sdb/TableDesign.idl8
-rw-r--r--offapi/com/sun/star/sdb/XAlterQuery.idl4
-rw-r--r--offapi/com/sun/star/sdb/XBookmarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XColumn.idl10
-rw-r--r--offapi/com/sun/star/sdb/XColumnUpdate.idl10
-rw-r--r--offapi/com/sun/star/sdb/XCommandPreparation.idl2
-rw-r--r--offapi/com/sun/star/sdb/XCompletedConnection.idl4
-rw-r--r--offapi/com/sun/star/sdb/XCompletedExecution.idl4
-rw-r--r--offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl2
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseAccess.idl6
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseAccessListener.idl2
-rw-r--r--offapi/com/sun/star/sdb/XDatabaseEnvironment.idl8
-rw-r--r--offapi/com/sun/star/sdb/XDocumentDataSource.idl2
-rw-r--r--offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XInteractionDocumentSave.idl4
-rw-r--r--offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl4
-rw-r--r--offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl8
-rw-r--r--offapi/com/sun/star/sdb/XParametersSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XQueriesSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XResultSetAccess.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/sdb/XRowSetApproveListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowSetSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/XRowsChangeListener.idl2
-rw-r--r--offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/sdb/XSQLErrorListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/XSQLQueryComposer.idl6
-rw-r--r--offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl2
-rw-r--r--offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl8
-rw-r--r--offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl8
-rw-r--r--offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/CopyTableWizard.idl12
-rw-r--r--offapi/com/sun/star/sdb/application/DatabaseObject.idl2
-rw-r--r--offapi/com/sun/star/sdb/application/XCopyTableListener.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/XCopyTableWizard.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl4
-rw-r--r--offapi/com/sun/star/sdb/tools/XConnectionTools.idl4
-rw-r--r--offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl2
-rw-r--r--offapi/com/sun/star/sdb/tools/XIndexAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XKeyAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XObjectNames.idl5
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableAlteration.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableName.idl8
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableRename.idl6
-rw-r--r--offapi/com/sun/star/sdb/tools/XViewAccess.idl6
96 files changed, 0 insertions, 476 deletions
diff --git a/offapi/com/sun/star/sdb/CallableStatement.idl b/offapi/com/sun/star/sdb/CallableStatement.idl
index 151ada30313f..46866d530090 100644
--- a/offapi/com/sun/star/sdb/CallableStatement.idl
+++ b/offapi/com/sun/star/sdb/CallableStatement.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_CallableStatement_idl__
#define __com_sun_star_sdb_CallableStatement_idl__
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__
#include <com/sun/star/sdbc/CallableStatement.idl>
-#endif
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__
#include <com/sun/star/sdb/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Column.idl b/offapi/com/sun/star/sdb/Column.idl
index 982dfccbab49..ef9c79b4878b 100644
--- a/offapi/com/sun/star/sdb/Column.idl
+++ b/offapi/com/sun/star/sdb/Column.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_Column_idl__
#define __com_sun_star_sdb_Column_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
index c28c615b2284..560990a386e9 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__
#define __com_sun_star_sdb_ColumnDescriptorControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
index a1ba82c14b55..7e55bf0913a3 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
#define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ColumnSettings.idl b/offapi/com/sun/star/sdb/ColumnSettings.idl
index dd76640a7803..0fff088b1aa3 100644
--- a/offapi/com/sun/star/sdb/ColumnSettings.idl
+++ b/offapi/com/sun/star/sdb/ColumnSettings.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#define __com_sun_star_sdb_ColumnSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Connection.idl b/offapi/com/sun/star/sdb/Connection.idl
index 66edbbf01b9d..29b7deeb4746 100644
--- a/offapi/com/sun/star/sdb/Connection.idl
+++ b/offapi/com/sun/star/sdb/Connection.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_Connection_idl__
#define __com_sun_star_sdb_Connection_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
module com { module sun { module star { module lang {
published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/sdb/ContentLoader.idl b/offapi/com/sun/star/sdb/ContentLoader.idl
index 8012afdf67d1..8dbcd1df6283 100644
--- a/offapi/com/sun/star/sdb/ContentLoader.idl
+++ b/offapi/com/sun/star/sdb/ContentLoader.idl
@@ -29,9 +29,7 @@
#ifndef __com_sun_star_sdb_ContentLoader_idl__
#define __com_sun_star_sdb_ContentLoader_idl__
-#ifndef __com_sun_star_frame_Frame_idl__
#include <com/sun/star/frame/FrameLoader.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index 91cc142f06de..3e3039777520 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
#define __com_sun_star_sdb_DataAccessDescriptor_idl__
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataColumn.idl b/offapi/com/sun/star/sdb/DataColumn.idl
index 8e5bc34924a1..15698d6886c5 100644
--- a/offapi/com/sun/star/sdb/DataColumn.idl
+++ b/offapi/com/sun/star/sdb/DataColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_DataColumn_idl__
#define __com_sun_star_sdb_DataColumn_idl__
-#ifndef __com_sun_star_sdb_ResultColumn_idl__
#include <com/sun/star/sdb/ResultColumn.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataSettings.idl b/offapi/com/sun/star/sdb/DataSettings.idl
index 326d5723cad3..d4cfd8a64c33 100644
--- a/offapi/com/sun/star/sdb/DataSettings.idl
+++ b/offapi/com/sun/star/sdb/DataSettings.idl
@@ -27,17 +27,10 @@
#ifndef __com_sun_star_sdb_DataSettings_idl__
#define __com_sun_star_sdb_DataSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index af2ded3582fb..9c78b742c9fa 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_DataSource_idl__
#define __com_sun_star_sdb_DataSource_idl__
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushable_idl__
#include <com/sun/star/util/XFlushable.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index c2bf52b04c7d..6785421cd0c6 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -29,21 +29,11 @@
#ifndef __com_sun_star_sdb_DataSourceBrowser_idl__
#define __com_sun_star_sdb_DataSourceBrowser_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
#include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccess.idl b/offapi/com/sun/star/sdb/DatabaseAccess.idl
index 8eb187384f35..06882bec93b0 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_DatabaseAccess_idl__
#define __com_sun_star_sdb_DatabaseAccess_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
index 4eb54d7db00a..a1be8caccef1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__
#define __com_sun_star_sdb_DatabaseAccessConnection_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
-#ifndef __com_sun_star_sdbc_Connection_idl__
#include <com/sun/star/sdbc/Connection.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
index 34922be1cdec..11763f6e3d78 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__
#define __com_sun_star_sdb_DatabaseAccessContext_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__
#include <com/sun/star/util/XLocalizedAliases.idl>
-#endif
-#ifndef __com_sun_star_lang_XLocalizable_idl__
#include <com/sun/star/lang/XLocalizable.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
index ff81048b834b..e23c97b3ece1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_sdb_DatabaseAccessDataSource_idl__
#define __com_sun_star_sdb_DatabaseAccessDataSource_idl__
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
#include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index ac990e02c709..6d8d081d1cd9 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_DatabaseContext_idl__
#define __com_sun_star_sdb_DatabaseContext_idl__
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_uno_XNamingService_idl__
#include <com/sun/star/uno/XNamingService.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 6690c2929de4..96ca66877ff3 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_DatabaseDocument_idl__
#define __com_sun_star_sdb_DatabaseDocument_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XProtectable_idl__
#include <com/sun/star/util/XProtectable.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
diff --git a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
index 72af2c84e7e8..5a26ca1394ed 100644
--- a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__
#define __com_sun_star_sdb_DatabaseEnvironment_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 79d5b31e6cbf..070d0aaa005d 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
#define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index c442929d4572..156a5a27ba29 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_DocumentDefinition_idl__
#define __com_sun_star_sdb_DocumentDefinition_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl
index 31a7128022c7..6013d4ade741 100644
--- a/offapi/com/sun/star/sdb/DocumentContainer.idl
+++ b/offapi/com/sun/star/sdb/DocumentContainer.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#define __com_sun_star_sdb_DocumentContainer_idl__
-#ifndef __com_sun_star_sdb_DefinitionContainer_idl__
#include <com/sun/star/sdb/DefinitionContainer.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
#include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
module com { module sun { module star { module lang {
diff --git a/offapi/com/sun/star/sdb/DocumentDataSource.idl b/offapi/com/sun/star/sdb/DocumentDataSource.idl
index 818d7645b2a0..79be69f078d5 100644
--- a/offapi/com/sun/star/sdb/DocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/DocumentDataSource.idl
@@ -27,15 +27,9 @@
#ifndef __com_sun_star_sdb_DocumentDataSource_idl__
#define __com_sun_star_sdb_DocumentDataSource_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
#include <com/sun/star/sdb/XDocumentDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSource_idl__
#include <com/sun/star/sdb/DataSource.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index 8ec36f9ec225..0a1d9e22dc78 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentDefinition2_idl__
#define __com_sun_star_sdb_DocumentDefinition2_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
#include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index a2a579fc47ac..48e4531692c4 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__
#define __com_sun_star_sdb_DocumentSaveRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 8c718103ef78..bb25adf93691 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__
#define __com_sun_star_sdb_ErrorMessageDialog_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/Forms.idl b/offapi/com/sun/star/sdb/Forms.idl
index 42d2f0dd3330..d72f88f87617 100644
--- a/offapi/com/sun/star/sdb/Forms.idl
+++ b/offapi/com/sun/star/sdb/Forms.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Forms_idl__
#define __com_sun_star_sdb_Forms_idl__
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index b01809802b2c..72e066ed4ba2 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__
#define __com_sun_star_sdb_OfficeDatabaseDocument_idl__
-#ifndef __com_sun_star_document_OfficeDocument_idl__
#include <com/sun/star/document/OfficeDocument.idl>
-#endif
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
#include <com/sun/star/document/XDocumentEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
#include <com/sun/star/script/provider/XScriptProviderSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
#include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/util/XCloseable.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/OrderColumn.idl b/offapi/com/sun/star/sdb/OrderColumn.idl
index baaaa4ae1416..420d685a8e20 100644
--- a/offapi/com/sun/star/sdb/OrderColumn.idl
+++ b/offapi/com/sun/star/sdb/OrderColumn.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_OrderColumn_idl__
#define __com_sun_star_sdb_OrderColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ParametersRequest.idl b/offapi/com/sun/star/sdb/ParametersRequest.idl
index 547c49e7fd4b..f4e7c6a65a33 100644
--- a/offapi/com/sun/star/sdb/ParametersRequest.idl
+++ b/offapi/com/sun/star/sdb/ParametersRequest.idl
@@ -27,16 +27,10 @@
#ifndef __com_sun_star_sdb_ParametersRequest_idl__
#define __com_sun_star_sdb_ParametersRequest_idl__
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/PreparedStatement.idl b/offapi/com/sun/star/sdb/PreparedStatement.idl
index 1ff4883e12df..06af4ef11f83 100644
--- a/offapi/com/sun/star/sdb/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdb/PreparedStatement.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_PreparedStatement_idl__
#define __com_sun_star_sdb_PreparedStatement_idl__
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/Query.idl b/offapi/com/sun/star/sdb/Query.idl
index d5fbe5e3579c..c0f4da4e5e19 100644
--- a/offapi/com/sun/star/sdb/Query.idl
+++ b/offapi/com/sun/star/sdb/Query.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Query_idl__
#define __com_sun_star_sdb_Query_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
@@ -37,13 +35,9 @@
published interface XRename;
};};};};
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__
#include <com/sun/star/sdb/QueryDefinition.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 8c995a64aba2..f5091787ca99 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_QueryDefinition_idl__
#define __com_sun_star_sdb_QueryDefinition_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDescriptor.idl b/offapi/com/sun/star/sdb/QueryDescriptor.idl
index 89845599c309..4e1410a43632 100644
--- a/offapi/com/sun/star/sdb/QueryDescriptor.idl
+++ b/offapi/com/sun/star/sdb/QueryDescriptor.idl
@@ -27,18 +27,14 @@
#ifndef __com_sun_star_sdb_QueryDescriptor_idl__
#define __com_sun_star_sdb_QueryDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDataDescriptorFactory;
published interface XColumnsSupplier;
};};};};
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index dbd74d416578..548875299182 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_QueryDesign_idl__
#define __com_sun_star_sdb_QueryDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 7b69a335ae31..218c400840c5 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_RelationDesign_idl__
#define __com_sun_star_sdb_RelationDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Reports.idl b/offapi/com/sun/star/sdb/Reports.idl
index 0951768c231b..41c927d12de9 100644
--- a/offapi/com/sun/star/sdb/Reports.idl
+++ b/offapi/com/sun/star/sdb/Reports.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_Reports_idl__
#define __com_sun_star_sdb_Reports_idl__
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
#include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
diff --git a/offapi/com/sun/star/sdb/ResultColumn.idl b/offapi/com/sun/star/sdb/ResultColumn.idl
index 1ba3d261bc6c..ad83cb435842 100644
--- a/offapi/com/sun/star/sdb/ResultColumn.idl
+++ b/offapi/com/sun/star/sdb/ResultColumn.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_ResultColumn_idl__
#define __com_sun_star_sdb_ResultColumn_idl__
-#ifndef __com_sun_star_sdbcx_Column_idl__
#include <com/sun/star/sdbcx/Column.idl>
-#endif
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/ResultSet.idl b/offapi/com/sun/star/sdb/ResultSet.idl
index 2ca4e304ebcf..0cfb3ae18f81 100644
--- a/offapi/com/sun/star/sdb/ResultSet.idl
+++ b/offapi/com/sun/star/sdb/ResultSet.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_ResultSet_idl__
#define __com_sun_star_sdb_ResultSet_idl__
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__
#include <com/sun/star/sdbcx/ResultSet.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/RowChangeEvent.idl b/offapi/com/sun/star/sdb/RowChangeEvent.idl
index a04eb97e0003..42881aba69c5 100644
--- a/offapi/com/sun/star/sdb/RowChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowChangeEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#define __com_sun_star_sdb_RowChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index 3cbf7706b217..3c5d1567ffdd 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_RowSet_idl__
#define __com_sun_star_sdb_RowSet_idl__
-#ifndef __com_sun_star_sdbc_RowSet_idl__
#include <com/sun/star/sdbc/RowSet.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
};};};};
-
-#ifndef __com_sun_star_sdb_ResultSet_idl__
#include <com/sun/star/sdb/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XDeleteRows;
diff --git a/offapi/com/sun/star/sdb/RowSetVetoException.idl b/offapi/com/sun/star/sdb/RowSetVetoException.idl
index 72f959ee8ca4..8e199ae83565 100644
--- a/offapi/com/sun/star/sdb/RowSetVetoException.idl
+++ b/offapi/com/sun/star/sdb/RowSetVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_RowSetVetoException_idl__
#define __com_sun_star_sdb_RowSetVetoException_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl
index d386a5552f9e..c5f7f94873cf 100644
--- a/offapi/com/sun/star/sdb/SQLContext.idl
+++ b/offapi/com/sun/star/sdb/SQLContext.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLContext_idl__
#define __com_sun_star_sdb_SQLContext_idl__
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLErrorEvent.idl b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
index 2be91d65a3dd..1037506879a1 100644
--- a/offapi/com/sun/star/sdb/SQLErrorEvent.idl
+++ b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
#define __com_sun_star_sdb_SQLErrorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLQueryComposer.idl b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
index 440011d8611a..cf030cb02a19 100644
--- a/offapi/com/sun/star/sdb/SQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SQLQueryComposer_idl__
#define __com_sun_star_sdb_SQLQueryComposer_idl__
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
module com { module sun { module star { module sdbcx {
published interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
index 160e537c3e89..85584a9543a0 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
#define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
module com { module sun { module star { module sdbcx {
interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
index 2d8ebcd93b4c..08f203e222cf 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__
#define __com_sun_star_sdb_SingleSelectQueryComposer_idl__
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/Table.idl b/offapi/com/sun/star/sdb/Table.idl
index edc179f45e27..9b0c78a6159c 100644
--- a/offapi/com/sun/star/sdb/Table.idl
+++ b/offapi/com/sun/star/sdb/Table.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_Table_idl__
#define __com_sun_star_sdb_Table_idl__
-#ifndef __com_sun_star_sdbcx_Table_idl__
#include <com/sun/star/sdbcx/Table.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/TableDescriptor.idl b/offapi/com/sun/star/sdb/TableDescriptor.idl
index 99fc7a056e36..4a03a9bb4102 100644
--- a/offapi/com/sun/star/sdb/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdb/TableDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_TableDescriptor_idl__
#define __com_sun_star_sdb_TableDescriptor_idl__
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
#include <com/sun/star/sdbcx/TableDescriptor.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSettings_idl__
#include <com/sun/star/sdb/DataSettings.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index a9ca8702f00b..814895e4bcbf 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_TableDesign_idl__
#define __com_sun_star_sdb_TableDesign_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
#include <com/sun/star/form/FormController.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XAlterQuery.idl b/offapi/com/sun/star/sdb/XAlterQuery.idl
index 39d328d68074..83008f5450ee 100644
--- a/offapi/com/sun/star/sdb/XAlterQuery.idl
+++ b/offapi/com/sun/star/sdb/XAlterQuery.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XAlterQuery_idl__
#define __com_sun_star_sdb_XAlterQuery_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
index fdb0e8adc7e0..e7f8a9875338 100644
--- a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__
#define __com_sun_star_sdb_XBookmarksSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XColumn.idl b/offapi/com/sun/star/sdb/XColumn.idl
index 7cb25c0e78dd..94ce6d7f453c 100644
--- a/offapi/com/sun/star/sdb/XColumn.idl
+++ b/offapi/com/sun/star/sdb/XColumn.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_XColumn_idl__
#define __com_sun_star_sdb_XColumn_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XColumnUpdate.idl b/offapi/com/sun/star/sdb/XColumnUpdate.idl
index cecad2439698..eecc71f034c6 100644
--- a/offapi/com/sun/star/sdb/XColumnUpdate.idl
+++ b/offapi/com/sun/star/sdb/XColumnUpdate.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_sdb_XColumnUpdate_idl__
#define __com_sun_star_sdb_XColumnUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
#include <com/sun/star/util/DateTime.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
#include <com/sun/star/util/Time.idl>
-#endif
module com { module sun { module star { module io {
published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XCommandPreparation.idl b/offapi/com/sun/star/sdb/XCommandPreparation.idl
index 25bed38357cd..d49a14278b9c 100644
--- a/offapi/com/sun/star/sdb/XCommandPreparation.idl
+++ b/offapi/com/sun/star/sdb/XCommandPreparation.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XCommandPreparation_idl__
#define __com_sun_star_sdb_XCommandPreparation_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XPreparedStatement;
diff --git a/offapi/com/sun/star/sdb/XCompletedConnection.idl b/offapi/com/sun/star/sdb/XCompletedConnection.idl
index c40a4069c092..02d797dcb15f 100644
--- a/offapi/com/sun/star/sdb/XCompletedConnection.idl
+++ b/offapi/com/sun/star/sdb/XCompletedConnection.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XCompletedConnection_idl__
#define __com_sun_star_sdb_XCompletedConnection_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
published interface XConnection;
diff --git a/offapi/com/sun/star/sdb/XCompletedExecution.idl b/offapi/com/sun/star/sdb/XCompletedExecution.idl
index 395598e1e70e..eb6002299cdf 100644
--- a/offapi/com/sun/star/sdb/XCompletedExecution.idl
+++ b/offapi/com/sun/star/sdb/XCompletedExecution.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#define __com_sun_star_sdb_XCompletedExecution_idl__
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
index 76680df46bec..ca0966f225be 100644
--- a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
#define __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccess.idl b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
index 9339d3efcac1..d22db49f3baa 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_XDatabaseAccess_idl__
#define __com_sun_star_sdb_XDatabaseAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module task {
published interface XInteractionHandler;
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
index 6826d9354a29..c153acb7b9f4 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__
#define __com_sun_star_sdb_XDatabaseAccessListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
index bf244d52c0ba..f32d0108812a 100644
--- a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__
#define __com_sun_star_sdb_XDatabaseEnvironment_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__
#include <com/sun/star/sdbc/XDriverManager.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index b0e891b0a084..5f6148c11355 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
#define __com_sun_star_sdb_XDocumentDataSource_idl__
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index 672505bc12ad..c3e125fdc940 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index 4d89d66a6ca4..f9d9691dede3 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__
#define __com_sun_star_sdb_XInteractionDocumentSave_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
#include <com/sun/star/ucb/XContent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
index 56bed78ff8fe..6554452f63b6 100644
--- a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
+++ b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__
#define __com_sun_star_sdb_XInteractionSupplyParameters_idl__
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index b2640704537c..ef7cdee0f173 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -27,18 +27,10 @@
#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
#include <com/sun/star/sdb/XFormDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
#include <com/sun/star/sdb/XReportDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
#include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XParametersSupplier.idl b/offapi/com/sun/star/sdb/XParametersSupplier.idl
index c5179eb02d7e..564396312e57 100644
--- a/offapi/com/sun/star/sdb/XParametersSupplier.idl
+++ b/offapi/com/sun/star/sdb/XParametersSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XParametersSupplier_idl__
#define __com_sun_star_sdb_XParametersSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XQueriesSupplier.idl b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
index a447b8fa598c..e191fcf41b80 100644
--- a/offapi/com/sun/star/sdb/XQueriesSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XQueriesSupplier_idl__
#define __com_sun_star_sdb_XQueriesSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
index e56d2fbafa56..4588e1c8835e 100644
--- a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
#define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index d7b15fbc0018..db17d331f03b 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
#include <com/sun/star/container/XNameAccess.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XResultSetAccess.idl b/offapi/com/sun/star/sdb/XResultSetAccess.idl
index a0c388e9374a..1aefdc9b821f 100644
--- a/offapi/com/sun/star/sdb/XResultSetAccess.idl
+++ b/offapi/com/sun/star/sdb/XResultSetAccess.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XResultSetAccess_idl__
#define __com_sun_star_sdb_XResultSetAccess_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module sdbc {
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 68f5e66535ac..fb1d49b2c763 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
#define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index c2388024e1e5..095b04af83ca 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__
#define __com_sun_star_sdb_XRowSetApproveListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index 7c7e2ab9ec42..45fa3c662cac 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XRowSetSupplier_idl__
#define __com_sun_star_sdb_XRowSetSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XRowsChangeListener.idl b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
index a3cfca899a20..6c7d65f46fa3 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XRowsChangeListener_idl__
#define __com_sun_star_sdb_XRowsChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
#include <com/sun/star/sdb/RowsChangeEvent.idl>
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
index 8b5d67c1e884..002d553033c7 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
#define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
#include <com/sun/star/sdb/XSQLErrorListener.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 6f7497fa7110..ec94ab656d58 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
#define __com_sun_star_sdb_XSQLErrorListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
#include <com/sun/star/sdb/SQLErrorEvent.idl>
-#endif
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index e9c5756db7d7..0ba2746afa55 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#define __com_sun_star_sdb_XSQLQueryComposer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 1382966f264c..157ad0b1a7d2 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
#define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb {
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 8c377e2f0693..84f1ba95d7c3 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#define __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star { module container {
interface XIndexAccess;
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 2bd5270adee8..ba7f716c58c5 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
index 9a9fc8761d02..75b6a6270199 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
#define __com_sun_star_sdb_application_CopyTableRowEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index f294c9f69d2c..c4c31ec4ae23 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_sdb_application_CopyTableWizard_idl__
#define __com_sun_star_sdb_application_CopyTableWizard_idl__
-#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
#include <com/sun/star/sdb/application/XCopyTableWizard.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 46f9f95a7500..762dc7ecdc88 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_application_DatabaseObject_idl__
#define __com_sun_star_sdb_application_DatabaseObject_idl__
-#ifndef __com_sun_star_sdb_CommandType_idl__
#include <com/sun/star/sdb/CommandType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
index d53f399b281c..ef64f3f71537 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_application_XCopyTableListener_idl__
#define __com_sun_star_sdb_application_XCopyTableListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
#include <com/sun/star/sdb/application/CopyTableRowEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index 9db2b0d5301f..8fd404489f07 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
#define __com_sun_star_sdb_application_XCopyTableWizard_idl__
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
#include <com/sun/star/beans/Optional.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index 413ce17d0901..e581792227c0 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -29,12 +29,8 @@
#define __com_sun_star_sdb_tools_XConnectionSupplier_idl__
#include <com/sun/star/sdbc/XConnection.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index fadfe541a165..9f74750c630b 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_sdb_tools_XConnectionTools_idl__
#define __com_sun_star_sdb_tools_XConnectionTools_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
module com { module sun { module star {
module container {
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index b2b00c758250..2ffb3caabb0a 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
#define __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index 784612363f44..bc6ebc4f146e 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XIndexAlteration_idl__
#define __com_sun_star_sdb_tools_XIndexAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 19f8347afc42..f2a00d23c58f 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XKeyAlteration_idl__
#define __com_sun_star_sdb_tools_XKeyAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index e636631339af..6f55eda0d20a 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sdb_tools_XObjectNames_idl__
#define __com_sun_star_sdb_tools_XObjectNames_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index 726632277892..9fed4c25d635 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XTableAlteration_idl__
#define __com_sun_star_sdb_tools_XTableAlteration_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 3e776214985e..4f80998bd4f3 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_sdb_tools_XTableName_idl__
#define __com_sun_star_sdb_tools_XTableName_idl__
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index a1b9ee37eabf..50bcb4c52beb 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XTableRename_idl__
#define __com_sun_star_sdb_tools_XTableRename_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index 731b906f6ba2..41f8c39c57c7 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -28,16 +28,10 @@
#ifndef __com_sun_star_sdb_tools_XViewAccess_idl__
#define __com_sun_star_sdb_tools_XViewAccess_idl__
-#ifndef __com_sun_star_sdbc_SQLException_idl__
#include <com/sun/star/sdbc/SQLException.idl>
-#endif
#include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
module com { module sun { module star { module sdb { module tools {