summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/form
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
commit0843dc709d9d2743a2e0010d00d8ad8a64cdd663 (patch)
tree1dea749ff89a4db5ed79aa3787f5296e5320379c /offapi/com/sun/star/form
parent18d161a4f506fa0f57888d2fbb51ae91e4ec85c6 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/form')
-rw-r--r--offapi/com/sun/star/form/DataAwareControlModel.idl10
-rw-r--r--offapi/com/sun/star/form/DatabaseDeleteEvent.idl2
-rw-r--r--offapi/com/sun/star/form/DatabaseParameterEvent.idl4
-rw-r--r--offapi/com/sun/star/form/ErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/form/FormComponent.idl12
-rw-r--r--offapi/com/sun/star/form/FormComponents.idl12
-rw-r--r--offapi/com/sun/star/form/FormControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/FormController.idl26
-rw-r--r--offapi/com/sun/star/form/FormControllerDispatcher.idl2
-rw-r--r--offapi/com/sun/star/form/Forms.idl11
-rw-r--r--offapi/com/sun/star/form/PropertyBrowserController.idl11
-rw-r--r--offapi/com/sun/star/form/XApproveActionBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XApproveActionListener.idl4
-rw-r--r--offapi/com/sun/star/form/XBoundComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XBoundControl.idl2
-rw-r--r--offapi/com/sun/star/form/XChangeBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XChangeListener.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XConfirmDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl2
-rw-r--r--offapi/com/sun/star/form/XDatabaseParameterListener.idl4
-rw-r--r--offapi/com/sun/star/form/XDeleteListener.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XErrorListener.idl4
-rw-r--r--offapi/com/sun/star/form/XForm.idl2
-rw-r--r--offapi/com/sun/star/form/XFormComponent.idl2
-rw-r--r--offapi/com/sun/star/form/XFormController.idl6
-rw-r--r--offapi/com/sun/star/form/XFormControllerListener.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XFormsSupplier2.idl2
-rw-r--r--offapi/com/sun/star/form/XGrid.idl2
-rw-r--r--offapi/com/sun/star/form/XGridColumnFactory.idl6
-rw-r--r--offapi/com/sun/star/form/XGridFieldDataSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XGridPeer.idl4
-rw-r--r--offapi/com/sun/star/form/XImageProducerSupplier.idl4
-rw-r--r--offapi/com/sun/star/form/XInsertListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadListener.idl4
-rw-r--r--offapi/com/sun/star/form/XLoadable.idl4
-rw-r--r--offapi/com/sun/star/form/XPositioningListener.idl4
-rw-r--r--offapi/com/sun/star/form/XReset.idl4
-rw-r--r--offapi/com/sun/star/form/XResetListener.idl4
-rw-r--r--offapi/com/sun/star/form/XRestoreListener.idl4
-rw-r--r--offapi/com/sun/star/form/XSubmit.idl8
-rw-r--r--offapi/com/sun/star/form/XSubmitListener.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/form/XUpdateListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableControlModel.idl4
-rw-r--r--offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl5
-rw-r--r--offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl2
-rw-r--r--offapi/com/sun/star/form/binding/IncompatibleTypesException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/InvalidBindingStateException.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntryEvent.idl2
-rw-r--r--offapi/com/sun/star/form/binding/ListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/ValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/binding/XBindableValue.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntryListener.idl4
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySink.idl2
-rw-r--r--offapi/com/sun/star/form/binding/XListEntrySource.idl6
-rw-r--r--offapi/com/sun/star/form/binding/XValueBinding.idl8
-rw-r--r--offapi/com/sun/star/form/component/CheckBox.idl8
-rw-r--r--offapi/com/sun/star/form/component/ComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/CurrencyField.idl6
-rw-r--r--offapi/com/sun/star/form/component/DataForm.idl20
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCheckBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseComboBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseCurrencyField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseDateField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseFormattedField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseImageControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/DatabaseNumericField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabasePatternField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseRadioButton.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTextField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DatabaseTimeField.idl4
-rw-r--r--offapi/com/sun/star/form/component/DateField.idl6
-rw-r--r--offapi/com/sun/star/form/component/FileControl.idl6
-rw-r--r--offapi/com/sun/star/form/component/FixedText.idl4
-rw-r--r--offapi/com/sun/star/form/component/Form.idl14
-rw-r--r--offapi/com/sun/star/form/component/FormattedField.idl6
-rw-r--r--offapi/com/sun/star/form/component/GridControl.idl26
-rw-r--r--offapi/com/sun/star/form/component/GroupBox.idl4
-rw-r--r--offapi/com/sun/star/form/component/HTMLForm.idl10
-rw-r--r--offapi/com/sun/star/form/component/HiddenControl.idl2
-rw-r--r--offapi/com/sun/star/form/component/ImageButton.idl10
-rw-r--r--offapi/com/sun/star/form/component/ListBox.idl6
-rw-r--r--offapi/com/sun/star/form/component/NavigationToolBar.idl4
-rw-r--r--offapi/com/sun/star/form/component/NumericField.idl6
-rw-r--r--offapi/com/sun/star/form/component/PatternField.idl6
-rw-r--r--offapi/com/sun/star/form/component/RadioButton.idl6
-rw-r--r--offapi/com/sun/star/form/component/RichTextControl.idl8
-rw-r--r--offapi/com/sun/star/form/component/ScrollBar.idl8
-rw-r--r--offapi/com/sun/star/form/component/SpinButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/SubmitButton.idl8
-rw-r--r--offapi/com/sun/star/form/component/TextField.idl10
-rw-r--r--offapi/com/sun/star/form/component/TimeField.idl6
-rw-r--r--offapi/com/sun/star/form/control/CheckBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ComboBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/CommandButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/CurrencyField.idl5
-rw-r--r--offapi/com/sun/star/form/control/DateField.idl5
-rw-r--r--offapi/com/sun/star/form/control/FormattedField.idl5
-rw-r--r--offapi/com/sun/star/form/control/GridControl.idl32
-rw-r--r--offapi/com/sun/star/form/control/GroupBox.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/ImageControl.idl5
-rw-r--r--offapi/com/sun/star/form/control/InteractionGridControl.idl4
-rw-r--r--offapi/com/sun/star/form/control/ListBox.idl8
-rw-r--r--offapi/com/sun/star/form/control/NavigationToolBar.idl2
-rw-r--r--offapi/com/sun/star/form/control/NumericField.idl5
-rw-r--r--offapi/com/sun/star/form/control/PatternField.idl5
-rw-r--r--offapi/com/sun/star/form/control/RadioButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/SubmitButton.idl5
-rw-r--r--offapi/com/sun/star/form/control/TextField.idl7
-rw-r--r--offapi/com/sun/star/form/control/TimeField.idl5
-rw-r--r--offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/EditPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/EventHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/FormOperations.idl8
-rw-r--r--offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl2
-rw-r--r--offapi/com/sun/star/form/runtime/XFormOperations.idl17
-rw-r--r--offapi/com/sun/star/form/submission/XSubmission.idl10
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionSupplier.idl2
-rw-r--r--offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl4
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl5
-rw-r--r--offapi/com/sun/star/form/validation/ValidatableControlModel.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatable.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidatableFormComponent.idl8
-rw-r--r--offapi/com/sun/star/form/validation/XValidator.idl5
-rw-r--r--offapi/com/sun/star/form/validation/XValidityConstraintListener.idl2
147 files changed, 0 insertions, 820 deletions
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index ab1848cc1..ab3e5ebe0 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#define __com_sun_star_form_DataAwareControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index 29deeeff5..44bbf0134 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__
#define __com_sun_star_form_DatabaseDeleteEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index d619d2e0e..a954f3096 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#define __com_sun_star_form_DatabaseParameterEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index 89f811ac3..0d67c46ca 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_ErrorEvent_idl__
#define __com_sun_star_form_ErrorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index 430c8ce57..a14eb86b3 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -27,24 +27,12 @@
#ifndef __com_sun_star_form_FormComponent_idl__
#define __com_sun_star_form_FormComponent_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyBag_idl__
#include <com/sun/star/beans/PropertyBag.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index 120cb46f5..a81465bac 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -27,22 +27,10 @@
#ifndef __com_sun_star_form_FormComponents_idl__
#define __com_sun_star_form_FormComponents_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#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
-
#include <com/sun/star/script/XEventAttacherManager.idl>
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index b5eab1bca..fe55a07be 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_FormControlModel_idl__
#define __com_sun_star_form_FormControlModel_idl__
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyState_idl__
#include <com/sun/star/beans/XPropertyState.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f0afa6cd2..f2e3cac54 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -27,49 +27,23 @@
#ifndef __com_sun_star_form_FormController_idl__
#define __com_sun_star_form_FormController_idl__
-#ifndef __com_sun_star_form_XFormController_idl__
#include <com/sun/star/form/XFormController.idl>
-#endif
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#include <com/sun/star/form/XConfirmDeleteBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
#include <com/sun/star/sdb/XSQLErrorBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
#include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#include <com/sun/star/form/FormControllerDispatcher.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index 0d88d2924..6b18f23a5 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
#define __com_sun_star_form_FormControllerDispatcher_idl__
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
#include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index fd381961f..e3a29dac8 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_form_Forms_idl__
#define __com_sun_star_form_Forms_idl__
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 812cb25c8..ca434cd65 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_form_PropertyBrowserController_idl__
#define __com_sun_star_form_PropertyBrowserController_idl__
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index 1f04866b0..68068ddec 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#define __com_sun_star_form_XApproveActionBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
#include <com/sun/star/form/XApproveActionListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index 7f6be2cdd..e8f12e1f3 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XApproveActionListener_idl__
#define __com_sun_star_form_XApproveActionListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 592f29530..0e1dd0526 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundComponent_idl__
#define __com_sun_star_form_XBoundComponent_idl__
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#include <com/sun/star/form/XUpdateBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 493651850..a02b90edb 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XBoundControl_idl__
#define __com_sun_star_form_XBoundControl_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index 23aa2f289..cc10c26ca 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#define __com_sun_star_form_XChangeBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeListener_idl__
#include <com/sun/star/form/XChangeListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index a506658ad..7baf6ba13 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XChangeListener_idl__
#define __com_sun_star_form_XChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index 6f771aea7..6cc057c33 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
#define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#include <com/sun/star/form/XConfirmDeleteListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index 7d6bcc9b9..7c37b62ed 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
#define __com_sun_star_form_XConfirmDeleteListener_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
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index 47f33de28..5831f5b21 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#include <com/sun/star/form/XDatabaseParameterListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 063370eb5..bcc57d2e7 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
#define __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 66ce82d4e..1b65f34df 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
#define __com_sun_star_form_XDatabaseParameterListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
#include <com/sun/star/form/DatabaseParameterEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index e317a8b43..f942aa15c 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XDeleteListener_idl__
#define __com_sun_star_form_XDeleteListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 63c941bcc..7167208c9 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorBroadcaster_idl__
#define __com_sun_star_form_XErrorBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XErrorListener_idl__
#include <com/sun/star/form/XErrorListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 18a75e994..e6b50d84a 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XErrorListener_idl__
#define __com_sun_star_form_XErrorListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_ErrorEvent_idl__
#include <com/sun/star/form/ErrorEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index f03b6a0ae..dc55c6438 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XForm_idl__
#define __com_sun_star_form_XForm_idl__
-#ifndef __com_sun_star_form_XFormComponent_idl__
#include <com/sun/star/form/XFormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index e85769157..eeab1433f 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XFormComponent_idl__
#define __com_sun_star_form_XFormComponent_idl__
-#ifndef __com_sun_star_container_XChild_idl__
#include <com/sun/star/container/XChild.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index 3855d84c2..521a8630f 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XFormController_idl__
#define __com_sun_star_form_XFormController_idl__
-#ifndef __com_sun_star_awt_XTabController_idl__
#include <com/sun/star/awt/XTabController.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
#include <com/sun/star/form/XFormControllerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 80ed3f82f..294d6b89d 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormControllerListener_idl__
#define __com_sun_star_form_XFormControllerListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 5bd9e901c..52e3eac1f 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XFormsSupplier_idl__
#define __com_sun_star_form_XFormsSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 8b6fd355f..fe3e0d7a3 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_XFormsSupplier2_idl__
#define __com_sun_star_form_XFormsSupplier2_idl__
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index 38a1f3158..b8fa924e2 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_XGrid_idl__
#define __com_sun_star_form_XGrid_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 671523dcb..2a20d2473 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#define __com_sun_star_form_XGridColumnFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.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
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 23319f034..977056c3f 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#define __com_sun_star_form_XGridFieldDataSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index f81f02bf5..574bdcf3e 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XGridPeer_idl__
#define __com_sun_star_form_XGridPeer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 6a9dbb9a4..a3361a5ba 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#define __com_sun_star_form_XImageProducerSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XImageProducer_idl__
#include <com/sun/star/awt/XImageProducer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index a53e0f9fc..60d62e6cd 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XInsertListener_idl__
#define __com_sun_star_form_XInsertListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index d2ca9690c..c67862937 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadListener_idl__
#define __com_sun_star_form_XLoadListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 42130cca6..22fa68cfc 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XLoadable_idl__
#define __com_sun_star_form_XLoadable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XLoadListener_idl__
#include <com/sun/star/form/XLoadListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index cff9ff017..473518092 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XPositioningListener_idl__
#define __com_sun_star_form_XPositioningListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 17129f08e..763681b09 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XReset_idl__
#define __com_sun_star_form_XReset_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XResetListener_idl__
#include <com/sun/star/form/XResetListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index fbafa0649..daaaef694 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XResetListener_idl__
#define __com_sun_star_form_XResetListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index ca9cd06ac..a0cdf65d8 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XRestoreListener_idl__
#define __com_sun_star_form_XRestoreListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index 4c5cb7119..007121c97 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_form_XSubmit_idl__
#define __com_sun_star_form_XSubmit_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XControl_idl__
#include <com/sun/star/awt/XControl.idl>
-#endif
-#ifndef __com_sun_star_awt_MouseEvent_idl__
#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmitListener_idl__
#include <com/sun/star/form/XSubmitListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index de50d2dce..b13db54db 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XSubmitListener_idl__
#define __com_sun_star_form_XSubmitListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index d49ae0606..41e623460 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
#define __com_sun_star_form_XUpdateBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_XUpdateListener_idl__
#include <com/sun/star/form/XUpdateListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 259c7d5b1..263c66a6e 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_XUpdateListener_idl__
#define __com_sun_star_form_XUpdateListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index aeb8999d6..272d32ced 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#define __com_sun_star_form_binding_BindableControlModel_idl__
-#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#include <com/sun/star/form/binding/XBindableValue.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index 640b8ea2e..47dd34cc6 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#define __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index fde5f805c..55c767fcc 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#include <com/sun/star/form/component/DatabaseCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index a0514a184..2bc372d5b 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#include <com/sun/star/form/component/DatabaseComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2a25a49fc..06f73760d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseDateField_idl__
#define __com_sun_star_form_binding_BindableDatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#include <com/sun/star/form/component/DatabaseDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index d526aa7f7..50254a58d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
#define __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#include <com/sun/star/form/component/DatabaseFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index e9bd4e685..1228e7271 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseListBox_idl__
#define __com_sun_star_form_binding_BindableDatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#include <com/sun/star/form/component/DatabaseListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index 4094d5cde..61878579c 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
#define __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#include <com/sun/star/form/component/DatabaseNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index 9722d8a9a..a7839d408 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
#define __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#include <com/sun/star/form/component/DatabaseRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 674a4f285..32badd925 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTextField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#include <com/sun/star/form/component/DatabaseTextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index 93ba21b1a..c29309a29 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
#define __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#include <com/sun/star/form/component/DatabaseTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
#include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 7d88a5013..a7352f138 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_BindableIntegerValueRange_idl__
#define __com_sun_star_form_binding_BindableIntegerValueRange_idl__
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 6349a187b..2b30a8778 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#define __com_sun_star_form_binding_IncompatibleTypesException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index 2e8518126..9d36f0a1c 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#define __com_sun_star_form_binding_InvalidBindingStateException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index 532adc655..9c21b7cf7 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#define __com_sun_star_form_binding_ListEntryEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index e25206965..63bfd3b35 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
#define __com_sun_star_form_binding_ListEntrySource_idl__
-#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#include <com/sun/star/form/binding/XListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index e3ac0b208..eb0662247 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_ValueBinding_idl__
#define __com_sun_star_form_binding_ValueBinding_idl__
-#ifndef __com_sun_star_util_XValueBinding_idl__
#include <com/sun/star/form/binding/XValueBinding.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 3e7a3e005..58e93548a 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XBindableValue_idl__
#define __com_sun_star_form_binding_XBindableValue_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index ff3873035..2845c9571 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_binding_XListEntryListener_idl__
#define __com_sun_star_form_binding_XListEntryListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
#include <com/sun/star/form/binding/ListEntryEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index e1e43d17d..ae1803c44 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_binding_XListEntrySink_idl__
#define __com_sun_star_form_binding_XListEntrySink_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index 08d719d09..ab883be61 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -28,15 +28,9 @@
#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
#define __com_sun_star_form_binding_XListEntrySource_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 56a50c6ac..83207e8f6 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_binding_XValueBinding_idl__
#define __com_sun_star_form_binding_XValueBinding_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
#include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
#include <com/sun/star/form/binding/InvalidBindingStateException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index ff9409730..290fe0ec8 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_CheckBox_idl__
#define __com_sun_star_form_component_CheckBox_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
#include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c54c2e459..b6dc6bf23 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ComboBox_idl__
#define __com_sun_star_form_component_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
#include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 2bf935205..2d54c7ea6 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_CurrencyField_idl__
#define __com_sun_star_form_component_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
#include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index ecc0c81a7..4c7d8fc88 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
#ifndef __com_sun_star_form_component_DataForm_idl__
#define __com_sun_star_form_component_DataForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
#include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
#include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
#include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
#include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
#include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
#include <com/sun/star/awt/TabControllerModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index d3d6127f0..f2fb4a224 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
#define __com_sun_star_form_component_DatabaseCheckBox_idl__
-#ifndef __com_sun_star_form_component_CheckBox_idl__
#include <com/sun/star/form/component/CheckBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 733308f0d..618b2ac27 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
#define __com_sun_star_form_component_DatabaseComboBox_idl__
-#ifndef __com_sun_star_form_component_ComboBox_idl__
#include <com/sun/star/form/component/ComboBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index c589ca062..8b70860a0 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
#define __com_sun_star_form_component_DatabaseCurrencyField_idl__
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
#include <com/sun/star/form/component/CurrencyField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 894a8d238..159de219b 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
#define __com_sun_star_form_component_DatabaseDateField_idl__
-#ifndef __com_sun_star_form_component_DateField_idl__
#include <com/sun/star/form/component/DateField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 90dda9c87..24a69e0d9 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
#define __com_sun_star_form_component_DatabaseFormattedField_idl__
-#ifndef __com_sun_star_form_component_FormattedField_idl__
#include <com/sun/star/form/component/FormattedField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index f3c5e4cca..2ec9fca06 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
#define __com_sun_star_form_component_DatabaseImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index 576c3a2b1..9f72d27ac 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
#define __com_sun_star_form_component_DatabaseListBox_idl__
-#ifndef __com_sun_star_form_component_ListBox_idl__
#include <com/sun/star/form/component/ListBox.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_ListSourceType_idl__
#include <com/sun/star/form/ListSourceType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index e68d581d3..219d58ba6 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
#define __com_sun_star_form_component_DatabaseNumericField_idl__
-#ifndef __com_sun_star_form_component_NumericField_idl__
#include <com/sun/star/form/component/NumericField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index f7f19dd18..382ffec1a 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabasePatternField_idl__
#define __com_sun_star_form_component_DatabasePatternField_idl__
-#ifndef __com_sun_star_form_component_PatternField_idl__
#include <com/sun/star/form/component/PatternField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index d2f07b71f..6f758bfd2 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
#define __com_sun_star_form_component_DatabaseRadioButton_idl__
-#ifndef __com_sun_star_form_component_RadioButton_idl__
#include <com/sun/star/form/component/RadioButton.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 8709ec890..fc528f127 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
#define __com_sun_star_form_component_DatabaseTextField_idl__
-#ifndef __com_sun_star_form_component_TextField_idl__
#include <com/sun/star/form/component/TextField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 740363584..655751516 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
#define __com_sun_star_form_component_DatabaseTimeField_idl__
-#ifndef __com_sun_star_form_component_TimeField_idl__
#include <com/sun/star/form/component/TimeField.idl>
-#endif
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index 72b0afdac..6db499e40 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_DateField_idl__
#define __com_sun_star_form_component_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
#include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index e042d1264..2a4bd38ee 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FileControl_idl__
#define __com_sun_star_form_component_FileControl_idl__
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
#include <com/sun/star/awt/UnoControlFileControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 4b3778be0..1de773f5d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_FixedText_idl__
#define __com_sun_star_form_component_FixedText_idl__
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
#include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 5b9be2cef..05d738e87 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
#ifndef __com_sun_star_form_component_Form_idl__
#define __com_sun_star_form_component_Form_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index a839f0ae2..790806ecd 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_FormattedField_idl__
#define __com_sun_star_form_component_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
#include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index ec12b65a5..c920292d9 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
#ifndef __com_sun_star_form_component_GridControl_idl__
#define __com_sun_star_form_component_GridControl_idl__
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
#include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
-#ifndef __com_sun_star_form_FormComponents_idl__
#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index 535d59c50..6b0eed5eb 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_form_component_GroupBox_idl__
#define __com_sun_star_form_component_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
#include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 08ebb1036..e0a78ad2c 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_HTMLForm_idl__
#define __com_sun_star_form_component_HTMLForm_idl__
-#ifndef __com_sun_star_form_component_Form_idl__
#include <com/sun/star/form/component/Form.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
-#ifndef __com_sun_star_form_XSubmit_idl__
#include <com/sun/star/form/XSubmit.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
#include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
#include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index f9d972542..904a080a1 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_form_component_HiddenControl_idl__
#define __com_sun_star_form_component_HiddenControl_idl__
-#ifndef __com_sun_star_form_FormComponent_idl__
#include <com/sun/star/form/FormComponent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 48cc3f209..1d28f464f 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
#ifndef __com_sun_star_form_component_ImageButton_idl__
#define __com_sun_star_form_component_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
-#ifndef __com_sun_star_form_FormButtonType_idl__
#include <com/sun/star/form/FormButtonType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index 3752e4d44..c1fdce566 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_ListBox_idl__
#define __com_sun_star_form_component_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
#include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index deeeb2ceb..fde0ffaca 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_component_NavigationToolBar_idl__
#define __com_sun_star_form_component_NavigationToolBar_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index faba3d05c..cff1500dd 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_NumericField_idl__
#define __com_sun_star_form_component_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
#include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index 4a4ee8616..cd8e207b3 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_PatternField_idl__
#define __com_sun_star_form_component_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
#include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 089c3d883..4248dc1b5 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_RadioButton_idl__
#define __com_sun_star_form_component_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
#include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 7cc56efca..f62bd3b14 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_component_RichTextControl_idl__
#define __com_sun_star_form_component_RichTextControl_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
#include <com/sun/star/text/TextRange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 8f8d8865f..7216ab2dc 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_ScrollBar_idl__
#define __com_sun_star_form_component_ScrollBar_idl__
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
#include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 33d1306f2..a3fca95e2 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SpinButton_idl__
#define __com_sun_star_form_component_SpinButton_idl__
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
#include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index 544ef3a94..40485719b 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_form_component_SubmitButton_idl__
#define __com_sun_star_form_component_SubmitButton_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
#include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index c9aa7a219..2489da97a 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
#ifndef __com_sun_star_form_component_TextField_idl__
#define __com_sun_star_form_component_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
#include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
#include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index 4c646182d..50889861d 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_form_component_TimeField_idl__
#define __com_sun_star_form_component_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
#include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XReset_idl__
#include <com/sun/star/form/XReset.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index e098c7d59..381b9d69c 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_component_checkbox_idl__
#define __com_sun_star_form_component_checkbox_idl__
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
#include <com/sun/star/awt/UnoControlCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index 46c0512fc..f9a52b790 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ComboBox_idl__
#define __com_sun_star_form_control_ComboBox_idl__
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
#include <com/sun/star/awt/UnoControlComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index 891153a0d..bb819ad2a 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CommandButton_idl__
#define __com_sun_star_form_control_CommandButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 6e05b6159..5a4a87d2d 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_CurrencyField_idl__
#define __com_sun_star_form_control_CurrencyField_idl__
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
#include <com/sun/star/awt/UnoControlCurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ba137ce67..b988c0ce3 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_DateField_idl__
#define __com_sun_star_form_control_DateField_idl__
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__
#include <com/sun/star/awt/UnoControlDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index 18fc8211b..cd13d47be 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_FormattedField_idl__
#define __com_sun_star_form_control_FormattedField_idl__
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
#include <com/sun/star/awt/UnoControlFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index 5c45c43a4..ef1cf2657 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -28,49 +28,17 @@
#ifndef __com_sun_star_form_control_GridControl_idl__
#define __com_sun_star_form_control_GridControl_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGrid_idl__
#include <com/sun/star/form/XGrid.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__
#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
#include <com/sun/star/form/XGridFieldDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeSelector_idl__
#include <com/sun/star/util/XModeSelector.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#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_frame_XDispatchProviderInterception_idl__
#include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 339526827..150f55f18 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_GroupBox_idl__
#define __com_sun_star_form_control_GroupBox_idl__
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
#include <com/sun/star/awt/UnoControlGroupBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 1cd1629ca..3cab821db 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageButton_idl__
#define __com_sun_star_form_control_ImageButton_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index de6711b03..4dda44d9f 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_ImageControl_idl__
#define __com_sun_star_form_control_ImageControl_idl__
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 48cf08043..f3d165336 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
#define __com_sun_star_form_component_InteractionGridControl_idl__
-#ifndef __com_sun_star_form_control_GridControl_idl__
#include <com/sun/star/form/control/GridControl.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatch_idl__
#include <com/sun/star/frame/XDispatch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index bad847c43..bdd4774e2 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_control_ListBox_idl__
#define __com_sun_star_form_control_ListBox_idl__
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__
#include <com/sun/star/awt/UnoControlListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index ec8762eec..034e0edcf 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_control_NavigationToolBar_idl__
#define __com_sun_star_form_control_NavigationToolBar_idl__
-#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index 45d9b2b7b..c23691387 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_NumericField_idl__
#define __com_sun_star_form_control_NumericField_idl__
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
#include <com/sun/star/awt/UnoControlNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index f09d31065..cd9f7fed9 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_PatternField_idl__
#define __com_sun_star_form_control_PatternField_idl__
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
#include <com/sun/star/awt/UnoControlPatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index 1907ad7c5..1112daeb5 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_RadioButton_idl__
#define __com_sun_star_form_control_RadioButton_idl__
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
#include <com/sun/star/awt/UnoControlRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index 790750341..5b056bce2 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_SubmitButton_idl__
#define __com_sun_star_form_control_SubmitButton_idl__
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
#include <com/sun/star/form/submission/XSubmission.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index aa053db87..edca94bf7 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -28,16 +28,9 @@
#ifndef __com_sun_star_form_control_TextField_idl__
#define __com_sun_star_form_control_TextField_idl__
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index f92fe724e..f93273d49 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_control_TimeField_idl__
#define __com_sun_star_form_control_TimeField_idl__
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
#include <com/sun/star/awt/UnoControlTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
#include <com/sun/star/form/XBoundControl.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 11896c239..b401d021e 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
#define __com_sun_star_form_ButtonNavigationHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 52cdadeb1..a2ee04db8 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
#define __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index 26bc733cf..74837f0a9 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
#define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index c27466e5f..5feed0af8 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_EditPropertyHandler_idl__
#define __com_sun_star_form_inspection_EditPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 4136be6bb..c883e3959 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_EventHandler_idl__
#define __com_sun_star_form_EventHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 9fed13039..ca8172dc3 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
#define __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index a84d76c94..9654f4d54 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
#define __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 2017c7d6e..dd27d832d 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
#define __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 34a40611b..4f2b75c9d 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
#define __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index e47f078d4..9ca3d7105 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_form_runtime_FormOperations_idl__
#define __com_sun_star_form_runtime_FormOperations_idl__
-#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#include <com/sun/star/form/runtime/XFormOperations.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
#include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index 6486de470..1b3255dfe 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
#define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index 375badf63..f49657980 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -28,31 +28,14 @@
#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
#define __com_sun_star_form_runtime_XFormOperations_idl__
-#ifndef __com_sun_star_form_runtime_FeatureState_idl__
#include <com/sun/star/form/runtime/FeatureState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
#include <com/sun/star/sdbc/XResultSetUpdate.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/form/runtime/XFormController.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_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index a3ee2be75..724b67b5b 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -28,21 +28,11 @@
#ifndef __com_sun_star_form_submission_XSubmission_idl__
#define __com_sun_star_form_submission_XSubmission_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 08771226f..6bc1ea899 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
#define __com_sun_star_form_submission_XSubmissionSupplier_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index f3473ed5e..0105b1939 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_form_submission_XSubmissionVetoListener_idl__
#define __com_sun_star_form_submission_XSubmissionVetoListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index e369f4a0d..2d6ffe588 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
-#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#include <com/sun/star/form/validation/ValidatableControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
#include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
//=============================================================================
module com { module sun { module star { module form { module validation {
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index ef4b4cc09..94d07e57e 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
#define __com_sun_star_form_validation_ValidatableControlModel_idl__
-#ifndef __com_sun_star_form_FormControlModel_idl__
#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#include <com/sun/star/form/validation/XValidatableFormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#include <com/sun/star/form/validation/XValidityConstraintListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index a967f388b..8157f1c87 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XFormComponentValidityListener_idl__
#define __com_sun_star_form_validation_XFormComponentValidityListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index 2a8c014c7..6280d70cb 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidatable_idl__
#define __com_sun_star_form_validation_XValidatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index f20c52ffd..ee2a1319c 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
#define __com_sun_star_form_validation_XValidatableFormComponent_idl__
-#ifndef __com_sun_star_form_validation_XValidatable_idl__
#include <com/sun/star/form/validation/XValidatable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 02a702430..bf81be977 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_form_validation_XValidator_idl__
#define __com_sun_star_form_validation_XValidator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
#include <com/sun/star/lang/NullPointerException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index f462bbf58..3028f260c 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
#define __com_sun_star_form_validation_XValidityConstraintListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
//=============================================================================