summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/util
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-04-02 00:08:53 +0200
commit45e7a5b78c29ebc5bd43ba65d1b02cb4457be613 (patch)
treee35eb3316b7f97bf0126b74d8816fdaabbc727e8 /offapi/com/sun/star/util
parent3ab3374ed3863c7c6e329c56aabec31d6c908656 (diff)
Strip include guards in idl files
Diffstat (limited to 'offapi/com/sun/star/util')
-rw-r--r--offapi/com/sun/star/util/ChangesEvent.idl6
-rw-r--r--offapi/com/sun/star/util/ChangesSet.idl4
-rw-r--r--offapi/com/sun/star/util/CloseVetoException.idl2
-rw-r--r--offapi/com/sun/star/util/DataEditorEvent.idl4
-rw-r--r--offapi/com/sun/star/util/DiskFullException.idl2
-rw-r--r--offapi/com/sun/star/util/FileIOException.idl2
-rw-r--r--offapi/com/sun/star/util/JobManager.idl2
-rw-r--r--offapi/com/sun/star/util/MalformedNumberFormatException.idl2
-rw-r--r--offapi/com/sun/star/util/ModeChangeEvent.idl2
-rw-r--r--offapi/com/sun/star/util/NotNumericException.idl2
-rw-r--r--offapi/com/sun/star/util/NumberFormatProperties.idl2
-rw-r--r--offapi/com/sun/star/util/NumberFormatSettings.idl4
-rw-r--r--offapi/com/sun/star/util/NumberFormats.idl4
-rw-r--r--offapi/com/sun/star/util/NumberFormatsSupplier.idl5
-rw-r--r--offapi/com/sun/star/util/NumberFormatter.idl4
-rw-r--r--offapi/com/sun/star/util/OfficeInstallationDirectories.idl2
-rw-r--r--offapi/com/sun/star/util/PathSettings.idl8
-rw-r--r--offapi/com/sun/star/util/PathSubstitution.idl8
-rw-r--r--offapi/com/sun/star/util/ReplaceDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SearchDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SortDescriptor.idl4
-rw-r--r--offapi/com/sun/star/util/SortField.idl2
-rw-r--r--offapi/com/sun/star/util/Sortable.idl5
-rw-r--r--offapi/com/sun/star/util/TextSearch.idl2
-rw-r--r--offapi/com/sun/star/util/URLTransformer.idl2
-rw-r--r--offapi/com/sun/star/util/UriAbbreviation.idl2
-rw-r--r--offapi/com/sun/star/util/VetoException.idl2
-rw-r--r--offapi/com/sun/star/util/XArchiver.idl6
-rw-r--r--offapi/com/sun/star/util/XAtomServer.idl8
-rw-r--r--offapi/com/sun/star/util/XBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/util/XCancelManager.idl4
-rw-r--r--offapi/com/sun/star/util/XCancellable.idl2
-rw-r--r--offapi/com/sun/star/util/XChainable.idl4
-rw-r--r--offapi/com/sun/star/util/XChangesBatch.idl6
-rw-r--r--offapi/com/sun/star/util/XChangesListener.idl4
-rw-r--r--offapi/com/sun/star/util/XChangesNotifier.idl2
-rw-r--r--offapi/com/sun/star/util/XChangesSet.idl6
-rw-r--r--offapi/com/sun/star/util/XCloneable.idl2
-rw-r--r--offapi/com/sun/star/util/XCloseBroadcaster.idl5
-rw-r--r--offapi/com/sun/star/util/XCloseListener.idl8
-rw-r--r--offapi/com/sun/star/util/XCloseable.idl5
-rw-r--r--offapi/com/sun/star/util/XDataEditor.idl4
-rw-r--r--offapi/com/sun/star/util/XDataEditorListener.idl4
-rw-r--r--offapi/com/sun/star/util/XFlushListener.idl4
-rw-r--r--offapi/com/sun/star/util/XFlushable.idl4
-rw-r--r--offapi/com/sun/star/util/XImportable.idl4
-rw-r--r--offapi/com/sun/star/util/XIndent.idl2
-rw-r--r--offapi/com/sun/star/util/XJobManager.idl5
-rw-r--r--offapi/com/sun/star/util/XLinkUpdate.idl2
-rw-r--r--offapi/com/sun/star/util/XLocalizedAliases.idl8
-rw-r--r--offapi/com/sun/star/util/XMergeable.idl2
-rw-r--r--offapi/com/sun/star/util/XModeChangeApproveListener.idl8
-rw-r--r--offapi/com/sun/star/util/XModeChangeBroadcaster.idl11
-rw-r--r--offapi/com/sun/star/util/XModeChangeListener.idl4
-rw-r--r--offapi/com/sun/star/util/XModeSelector.idl4
-rw-r--r--offapi/com/sun/star/util/XModifiable.idl4
-rw-r--r--offapi/com/sun/star/util/XModifiable2.idl4
-rw-r--r--offapi/com/sun/star/util/XModifyBroadcaster.idl4
-rw-r--r--offapi/com/sun/star/util/XModifyListener.idl4
-rw-r--r--offapi/com/sun/star/util/XNumberFormatPreviewer.idl11
-rw-r--r--offapi/com/sun/star/util/XNumberFormatTypes.idl5
-rw-r--r--offapi/com/sun/star/util/XNumberFormats.idl8
-rw-r--r--offapi/com/sun/star/util/XNumberFormatsSupplier.idl6
-rw-r--r--offapi/com/sun/star/util/XNumberFormatter.idl11
-rw-r--r--offapi/com/sun/star/util/XOfficeInstallationDirectories.idl2
-rw-r--r--offapi/com/sun/star/util/XPropertyReplace.idl8
-rw-r--r--offapi/com/sun/star/util/XProtectable.idl4
-rw-r--r--offapi/com/sun/star/util/XRefreshListener.idl4
-rw-r--r--offapi/com/sun/star/util/XRefreshable.idl4
-rw-r--r--offapi/com/sun/star/util/XReplaceDescriptor.idl2
-rw-r--r--offapi/com/sun/star/util/XReplaceable.idl6
-rw-r--r--offapi/com/sun/star/util/XSearchDescriptor.idl2
-rw-r--r--offapi/com/sun/star/util/XSearchable.idl6
-rw-r--r--offapi/com/sun/star/util/XSimpleErrorHandler.idl2
-rw-r--r--offapi/com/sun/star/util/XSortable.idl4
-rw-r--r--offapi/com/sun/star/util/XStringAbbreviation.idl2
-rw-r--r--offapi/com/sun/star/util/XStringEscape.idl4
-rw-r--r--offapi/com/sun/star/util/XStringMapping.idl2
-rw-r--r--offapi/com/sun/star/util/XStringSubstitution.idl5
-rw-r--r--offapi/com/sun/star/util/XStringWidth.idl2
-rw-r--r--offapi/com/sun/star/util/XTimeStamped.idl2
-rw-r--r--offapi/com/sun/star/util/XURLTransformer.idl5
-rw-r--r--offapi/com/sun/star/util/XUniqueIDFactory.idl2
-rw-r--r--offapi/com/sun/star/util/XUpdatable.idl5
84 files changed, 0 insertions, 352 deletions
diff --git a/offapi/com/sun/star/util/ChangesEvent.idl b/offapi/com/sun/star/util/ChangesEvent.idl
index e17893d52115..92a0a537bda3 100644
--- a/offapi/com/sun/star/util/ChangesEvent.idl
+++ b/offapi/com/sun/star/util/ChangesEvent.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_ChangesEvent_idl__
#define __com_sun_star_util_ChangesEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesSet_idl__
#include <com/sun/star/util/ChangesSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ChangesSet.idl b/offapi/com/sun/star/util/ChangesSet.idl
index 439ff2e31861..41b8f2d29b03 100644
--- a/offapi/com/sun/star/util/ChangesSet.idl
+++ b/offapi/com/sun/star/util/ChangesSet.idl
@@ -27,14 +27,10 @@
#ifndef __com_sun_star_util_ChangesSet_idl__
#define __com_sun_star_util_ChangesSet_idl__
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
/*
-#ifndef __com_sun_star_util_XChangesSet_idl__
#include <com/sun/star/util/XChangesSet.idl>
-#endif
*/
//=============================================================================
diff --git a/offapi/com/sun/star/util/CloseVetoException.idl b/offapi/com/sun/star/util/CloseVetoException.idl
index 49608f76b0be..bff5ad8e3166 100644
--- a/offapi/com/sun/star/util/CloseVetoException.idl
+++ b/offapi/com/sun/star/util/CloseVetoException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_CloseVetoException_idl__
#define __com_sun_star_util_CloseVetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/DataEditorEvent.idl b/offapi/com/sun/star/util/DataEditorEvent.idl
index 0d5b34cc00ae..351755dcbc9a 100644
--- a/offapi/com/sun/star/util/DataEditorEvent.idl
+++ b/offapi/com/sun/star/util/DataEditorEvent.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_DataEditorEvent_idl__
#define __com_sun_star_util_DataEditorEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_util_DataEditorEventType_idl__
#include <com/sun/star/util/DataEditorEventType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/DiskFullException.idl b/offapi/com/sun/star/util/DiskFullException.idl
index 43eda08302a2..2387feb87d3d 100644
--- a/offapi/com/sun/star/util/DiskFullException.idl
+++ b/offapi/com/sun/star/util/DiskFullException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_DiskFullException_idl__
#define __com_sun_star_util_DiskFullException_idl__
-#ifndef __com_sun_star_util_FileIOException_idl__
#include <com/sun/star/util/FileIOException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/FileIOException.idl b/offapi/com/sun/star/util/FileIOException.idl
index 804c18094704..61a07bff7c35 100644
--- a/offapi/com/sun/star/util/FileIOException.idl
+++ b/offapi/com/sun/star/util/FileIOException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_FileIOException_idl__
#define __com_sun_star_util_FileIOException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index e90c4ed572b2..71baadb755ed 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun__star_util_JobManager_idl__
#define __com_sun__star_util_JobManager_idl__
-#ifndef __com_sun_star_util_XJobManager_idl__
#include <com/sun/star/util/XJobManager.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/MalformedNumberFormatException.idl b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
index f084663289d3..72ee5f489c6a 100644
--- a/offapi/com/sun/star/util/MalformedNumberFormatException.idl
+++ b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#define __com_sun_star_util_MalformedNumberFormatException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ModeChangeEvent.idl b/offapi/com/sun/star/util/ModeChangeEvent.idl
index f03b337e1bbc..b6a84c3cc2e1 100644
--- a/offapi/com/sun/star/util/ModeChangeEvent.idl
+++ b/offapi/com/sun/star/util/ModeChangeEvent.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#define __com_sun_star_util_ModeChangeEvent_idl__
-#ifndef __com_sun_star_lang_EventObject_idl__
#include <com/sun/star/lang/EventObject.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NotNumericException.idl b/offapi/com/sun/star/util/NotNumericException.idl
index ed1d550c2163..e511fd4df745 100644
--- a/offapi/com/sun/star/util/NotNumericException.idl
+++ b/offapi/com/sun/star/util/NotNumericException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_NotNumericException_idl__
#define __com_sun_star_util_NotNumericException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatProperties.idl b/offapi/com/sun/star/util/NumberFormatProperties.idl
index 7c747aff3d0f..f385a9019137 100644
--- a/offapi/com/sun/star/util/NumberFormatProperties.idl
+++ b/offapi/com/sun/star/util/NumberFormatProperties.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_NumberFormatProperties_idl__
#define __com_sun_star_util_NumberFormatProperties_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatSettings.idl b/offapi/com/sun/star/util/NumberFormatSettings.idl
index 2f1013ae93ad..6b327c94b075 100644
--- a/offapi/com/sun/star/util/NumberFormatSettings.idl
+++ b/offapi/com/sun/star/util/NumberFormatSettings.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormatSettings_idl__
#define __com_sun_star_util_NumberFormatSettings_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
#include <com/sun/star/util/Date.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormats.idl b/offapi/com/sun/star/util/NumberFormats.idl
index a451fd1b7a4f..11eadaf86910 100644
--- a/offapi/com/sun/star/util/NumberFormats.idl
+++ b/offapi/com/sun/star/util/NumberFormats.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormats_idl__
#define __com_sun_star_util_NumberFormats_idl__
-#ifndef __com_sun_star_util_XNumberFormats_idl__
#include <com/sun/star/util/XNumberFormats.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
#include <com/sun/star/util/XNumberFormatTypes.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 3b7fae2d7ecb..e7bde9de4636 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_NumberFormatsSupplier_idl__
#define __com_sun_star_util_NumberFormatsSupplier_idl__
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
#include <com/sun/star/lang/XInitialization.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index c130dfebc210..daa4ff5e1e25 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_NumberFormatter_idl__
#define __com_sun_star_util_NumberFormatter_idl__
-#ifndef __com_sun_star_util_XNumberFormatter_idl__
#include <com/sun/star/util/XNumberFormatter.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
#include <com/sun/star/util/XNumberFormatPreviewer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index 302330fb2eec..c6bee6191e05 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_OfficeInstallationDirectories_idl__
#define __com_sun_star_util_OfficeInstallationDirectories_idl__
-#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
#include <com/sun/star/util/XOfficeInstallationDirectories.idl>
-#endif
//============================================================================
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index 3c6d92c584c6..2496e3071b30 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_PathSettings_idl__
#define __com_sun_star_util_PathSettings_idl__
-#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/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index dcc3bdab976d..46711e3c97f5 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_PathSubstitution_idl__
#define __com_sun_star_util_PathSubstitution_idl__
-#ifndef __com_sun_star_util_XStringSubstitution_idl__
#include <com/sun/star/util/XStringSubstitution.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerListener_idl__
#include <com/sun/star/container/XContainerListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/ReplaceDescriptor.idl b/offapi/com/sun/star/util/ReplaceDescriptor.idl
index 192c10707226..eea45c5c6941 100644
--- a/offapi/com/sun/star/util/ReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/ReplaceDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_ReplaceDescriptor_idl__
#define __com_sun_star_util_ReplaceDescriptor_idl__
-#ifndef __com_sun_star_util_SearchDescriptor_idl__
#include <com/sun/star/util/SearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SearchDescriptor.idl b/offapi/com/sun/star/util/SearchDescriptor.idl
index b49e174ccf50..cd334f763b06 100644
--- a/offapi/com/sun/star/util/SearchDescriptor.idl
+++ b/offapi/com/sun/star/util/SearchDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_SearchDescriptor_idl__
#define __com_sun_star_util_SearchDescriptor_idl__
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index 2c0b1d2ac83f..e42ef03f96df 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_SortDescriptor_idl__
#define __com_sun_star_util_SortDescriptor_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/SortField.idl b/offapi/com/sun/star/util/SortField.idl
index 0c20871f3863..f1edab68800b 100644
--- a/offapi/com/sun/star/util/SortField.idl
+++ b/offapi/com/sun/star/util/SortField.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_SortField_idl__
#define __com_sun_star_util_SortField_idl__
-#ifndef __com_sun_star_util_SortFieldType_idl__
#include <com/sun/star/util/SortFieldType.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/Sortable.idl b/offapi/com/sun/star/util/Sortable.idl
index 8b0f7e0688e2..cced73bcbcba 100644
--- a/offapi/com/sun/star/util/Sortable.idl
+++ b/offapi/com/sun/star/util/Sortable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_Sortable_idl__
#define __com_sun_star_util_Sortable_idl__
-#ifndef __com_sun_star_util_SortDescriptor_idl__
#include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
#include <com/sun/star/util/XSortable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index f6abf8c088e1..3154389afae6 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_TextSearch_idl__
#define __com_sun_star_util_TextSearch_idl__
-#ifndef __com_sun_star_lang_XTextSearch_idl__
#include <com/sun/star/util/XTextSearch.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 46b4879a7e7d..8839ad229154 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_URLTransformer_idl__
#define __com_sun_star_util_URLTransformer_idl__
-#ifndef __com_sun_star_util_XURLTransformer_idl__
#include <com/sun/star/util/XURLTransformer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 2825fe74b32d..14a88deed4b9 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun__star_util_UriAbbreviation_idl__
#define __com_sun__star_util_UriAbbreviation_idl__
-#ifndef __com_sun_star_util_XStringAbbreviation_idl__
#include <com/sun/star/util/XStringAbbreviation.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/VetoException.idl b/offapi/com/sun/star/util/VetoException.idl
index fdf4d084d790..d197c3c9b350 100644
--- a/offapi/com/sun/star/util/VetoException.idl
+++ b/offapi/com/sun/star/util/VetoException.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_VetoException_idl__
#define __com_sun_star_util_VetoException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XArchiver.idl b/offapi/com/sun/star/util/XArchiver.idl
index d3aee96cf08c..6a4e43f7f674 100644
--- a/offapi/com/sun/star/util/XArchiver.idl
+++ b/offapi/com/sun/star/util/XArchiver.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XArchiver_idl__
#define __com_sun_star_util_XArchiver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XAtomServer.idl b/offapi/com/sun/star/util/XAtomServer.idl
index 0472ea2b7946..3150454489f5 100644
--- a/offapi/com/sun/star/util/XAtomServer.idl
+++ b/offapi/com/sun/star/util/XAtomServer.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_util_XAtomServer_idl__
#define __com_sun_star_util_XAtomServer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomDescription_idl__
#include <com/sun/star/util/AtomDescription.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomClassRequest_idl__
#include <com/sun/star/util/AtomClassRequest.idl>
-#endif
module com
diff --git a/offapi/com/sun/star/util/XBroadcaster.idl b/offapi/com/sun/star/util/XBroadcaster.idl
index 05b2a2922609..81e9494767ce 100644
--- a/offapi/com/sun/star/util/XBroadcaster.idl
+++ b/offapi/com/sun/star/util/XBroadcaster.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XBroadcaster_idl__
#define __com_sun_star_util_XBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCancelManager.idl b/offapi/com/sun/star/util/XCancelManager.idl
index 91ea42356bea..ef9ae90b5f54 100644
--- a/offapi/com/sun/star/util/XCancelManager.idl
+++ b/offapi/com/sun/star/util/XCancelManager.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XCancelManager_idl__
#define __com_sun_star_util_XCancelManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCancellable.idl b/offapi/com/sun/star/util/XCancellable.idl
index 5e8fa59b05f6..f7915c133672 100644
--- a/offapi/com/sun/star/util/XCancellable.idl
+++ b/offapi/com/sun/star/util/XCancellable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XCancellable_idl__
#define __com_sun_star_util_XCancellable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChainable.idl b/offapi/com/sun/star/util/XChainable.idl
index e381bc683839..41d7d1f9843c 100644
--- a/offapi/com/sun/star/util/XChainable.idl
+++ b/offapi/com/sun/star/util/XChainable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XChainable_idl__
#define __com_sun_star_util_XChainable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesBatch.idl b/offapi/com/sun/star/util/XChangesBatch.idl
index 2c8abbede55a..a42e7bc69050 100644
--- a/offapi/com/sun/star/util/XChangesBatch.idl
+++ b/offapi/com/sun/star/util/XChangesBatch.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XChangesBatch_idl__
#define __com_sun_star_util_XChangesBatch_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesSet_idl__
#include <com/sun/star/util/ChangesSet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesListener.idl b/offapi/com/sun/star/util/XChangesListener.idl
index 5591c2caf091..3ef055dfeef2 100644
--- a/offapi/com/sun/star/util/XChangesListener.idl
+++ b/offapi/com/sun/star/util/XChangesListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XChangesListener_idl__
#define __com_sun_star_util_XChangesListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_ChangesEvent_idl__
#include <com/sun/star/util/ChangesEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl
index f532bc6b476f..fc6081a93791 100644
--- a/offapi/com/sun/star/util/XChangesNotifier.idl
+++ b/offapi/com/sun/star/util/XChangesNotifier.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XChangesNotifier_idl__
#define __com_sun_star_util_XChangesNotifier_idl__
-#ifndef __com_sun_star_util_XChangesListener_idl__
#include <com/sun/star/util/XChangesListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesSet.idl b/offapi/com/sun/star/util/XChangesSet.idl
index b812d0389eef..3db6539260fc 100644
--- a/offapi/com/sun/star/util/XChangesSet.idl
+++ b/offapi/com/sun/star/util/XChangesSet.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XChangesSet_idl__
#define __com_sun_star_util_XChangesSet_idl__
-#ifndef __com_sun_star_container_XElementAccess_idl__
#include <com/sun/star/container/XElementAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_util_ElementChange_idl__
#include <com/sun/star/util/ElementChange.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloneable.idl b/offapi/com/sun/star/util/XCloneable.idl
index f89fcb9eb96d..a47ba1371e4f 100644
--- a/offapi/com/sun/star/util/XCloneable.idl
+++ b/offapi/com/sun/star/util/XCloneable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XCloneable_idl__
#define __com_sun_star_util_XCloneable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloseBroadcaster.idl b/offapi/com/sun/star/util/XCloseBroadcaster.idl
index 84541f4fc7fc..07719e231b7c 100644
--- a/offapi/com/sun/star/util/XCloseBroadcaster.idl
+++ b/offapi/com/sun/star/util/XCloseBroadcaster.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
#define __com_sun_star_util_XCloseBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseListener_idl__
#include <com/sun/star/util/XCloseListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl
index ecbf526c75c4..0e9037a3812d 100644
--- a/offapi/com/sun/star/util/XCloseListener.idl
+++ b/offapi/com/sun/star/util/XCloseListener.idl
@@ -27,17 +27,9 @@
#ifndef __com_sun_star_util_XCloseListener_idl__
#define __com_sun_star_util_XCloseListener_idl__
-#ifndef __com_sun_star_util_CloseVetoException_idl__
#include <com/sun/star/util/CloseVetoException.idl>
-#endif
-
-#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/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 28b37907bbe4..28c0371325ee 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XClosable_idl__
#define __com_sun_star_util_XClosable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
#include <com/sun/star/util/XCloseBroadcaster.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XDataEditor.idl b/offapi/com/sun/star/util/XDataEditor.idl
index 82cc18d53eae..874a7ca55b8f 100644
--- a/offapi/com/sun/star/util/XDataEditor.idl
+++ b/offapi/com/sun/star/util/XDataEditor.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XDataEditor_idl__
#define __com_sun_star_util_XDataEditor_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XDataEditorListener_idl__
#include <com/sun/star/util/XDataEditorListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XDataEditorListener.idl b/offapi/com/sun/star/util/XDataEditorListener.idl
index abe91ed2a36a..7864b3f8b6d4 100644
--- a/offapi/com/sun/star/util/XDataEditorListener.idl
+++ b/offapi/com/sun/star/util/XDataEditorListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XDataEditorListener_idl__
#define __com_sun_star_util_XDataEditorListener_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_DataEditorEvent_idl__
#include <com/sun/star/util/DataEditorEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XFlushListener.idl b/offapi/com/sun/star/util/XFlushListener.idl
index 521aebc5e003..7a155f59e606 100644
--- a/offapi/com/sun/star/util/XFlushListener.idl
+++ b/offapi/com/sun/star/util/XFlushListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XFlushListener_idl__
#define __com_sun_star_util_XFlushListener_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/util/XFlushable.idl b/offapi/com/sun/star/util/XFlushable.idl
index 668d64055ed8..e468f4351ec4 100644
--- a/offapi/com/sun/star/util/XFlushable.idl
+++ b/offapi/com/sun/star/util/XFlushable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XFlushable_idl__
#define __com_sun_star_util_XFlushable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushListener_idl__
#include <com/sun/star/util/XFlushListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 05872c6e3231..31b8a38f1802 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XImportable_idl__
#define __com_sun_star_util_XImportable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XIndent.idl b/offapi/com/sun/star/util/XIndent.idl
index dffd7334316b..887bd4af1683 100644
--- a/offapi/com/sun/star/util/XIndent.idl
+++ b/offapi/com/sun/star/util/XIndent.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XIndent_idl__
#define __com_sun_star_util_XIndent_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XJobManager.idl b/offapi/com/sun/star/util/XJobManager.idl
index 7c75a83d036d..56eb08f51a04 100644
--- a/offapi/com/sun/star/util/XJobManager.idl
+++ b/offapi/com/sun/star/util/XJobManager.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_XJobManager_idl__
#define __com_sun_star_util_XJobManager_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
#include <com/sun/star/util/XCancellable.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XLinkUpdate.idl b/offapi/com/sun/star/util/XLinkUpdate.idl
index d4c3a1a41850..6b2da86142e9 100644
--- a/offapi/com/sun/star/util/XLinkUpdate.idl
+++ b/offapi/com/sun/star/util/XLinkUpdate.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XLinkUpdate_idl__
#define __com_sun_star_util_XLinkUpdate_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XLocalizedAliases.idl b/offapi/com/sun/star/util/XLocalizedAliases.idl
index 3e9ba00f1195..0dd7bce38ead 100644
--- a/offapi/com/sun/star/util/XLocalizedAliases.idl
+++ b/offapi/com/sun/star/util/XLocalizedAliases.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XLocalizedAliases_idl__
#define __com_sun_star_util_XLocalizedAliases_idl__
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__
#include <com/sun/star/util/AliasProgrammaticPair.idl>
-#endif
//=============================================================================
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XMergeable.idl b/offapi/com/sun/star/util/XMergeable.idl
index ba2ac3bc90ea..1c3d82169e46 100644
--- a/offapi/com/sun/star/util/XMergeable.idl
+++ b/offapi/com/sun/star/util/XMergeable.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XMergeable_idl__
#define __com_sun_star_util_XMergeable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index 76226462531f..f973f503ec4f 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -28,17 +28,9 @@
#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
#define __com_sun_star_util_XModeChangeApproveListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
#include <com/sun/star/util/VetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index 1c9cbbde8fa8..3c297dfa4646 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_util_XModeChangeBroadcaster_idl__
#define __com_sun_star_util_XModeChangeBroadcaster_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_util_XModeChangeListener_idl__
#include <com/sun/star/util/XModeChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
#include <com/sun/star/util/XModeChangeApproveListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index 5f3437081585..417f029eee43 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -28,13 +28,9 @@
#ifndef __com_sun_star_util_XModeChangeListener_idl__
#define __com_sun_star_util_XModeChangeListener_idl__
-#ifndef __com_sun_star_lang_XEventListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
#include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModeSelector.idl b/offapi/com/sun/star/util/XModeSelector.idl
index 7efefb361a04..24a740d79090 100644
--- a/offapi/com/sun/star/util/XModeSelector.idl
+++ b/offapi/com/sun/star/util/XModeSelector.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModeSelector_idl__
#define __com_sun_star_util_XModeSelector_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
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable.idl b/offapi/com/sun/star/util/XModifiable.idl
index 2f0b37531aca..972b99c9e4ab 100644
--- a/offapi/com/sun/star/util/XModifiable.idl
+++ b/offapi/com/sun/star/util/XModifiable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifiable_idl__
#define __com_sun_star_util_XModifiable_idl__
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index a2f7287a4a83..3352562d986a 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifiable2_idl__
#define __com_sun_star_util_XModifiable2_idl__
-#ifndef __com_sun_star_util_XModifiable_idl__
#include <com/sun/star/util/XModifiable.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifyBroadcaster.idl b/offapi/com/sun/star/util/XModifyBroadcaster.idl
index 657db5400126..d65f3661342f 100644
--- a/offapi/com/sun/star/util/XModifyBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModifyBroadcaster.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
#define __com_sun_star_util_XModifyBroadcaster_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyListener_idl__
#include <com/sun/star/util/XModifyListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XModifyListener.idl b/offapi/com/sun/star/util/XModifyListener.idl
index e31574aaff2a..b9eefa7a1664 100644
--- a/offapi/com/sun/star/util/XModifyListener.idl
+++ b/offapi/com/sun/star/util/XModifyListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XModifyListener_idl__
#define __com_sun_star_util_XModifyListener_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/util/XNumberFormatPreviewer.idl b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
index cd94ebd1335f..f53a62363ea5 100644
--- a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
+++ b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
#define __com_sun_star_util_XNumberFormatPreviewer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatTypes.idl b/offapi/com/sun/star/util/XNumberFormatTypes.idl
index 9c896440e20e..399bb715f35c 100644
--- a/offapi/com/sun/star/util/XNumberFormatTypes.idl
+++ b/offapi/com/sun/star/util/XNumberFormatTypes.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
#define __com_sun_star_util_XNumberFormatTypes_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl b/offapi/com/sun/star/util/XNumberFormats.idl
index 25954d8e4f99..527681dde3a8 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XNumberFormats_idl__
#define __com_sun_star_util_XNumberFormats_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_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
index 505be56288bc..4bb5085fa34d 100644
--- a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#define __com_sun_star_util_XNumberFormatsSupplier_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_util_XNumberFormats_idl__
#include <com/sun/star/util/XNumberFormats.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatter.idl b/offapi/com/sun/star/util/XNumberFormatter.idl
index f01f1b30bf73..b0e44ab2d731 100644
--- a/offapi/com/sun/star/util/XNumberFormatter.idl
+++ b/offapi/com/sun/star/util/XNumberFormatter.idl
@@ -27,25 +27,14 @@
#ifndef __com_sun_star_util_XNumberFormatter_idl__
#define __com_sun_star_util_XNumberFormatter_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-#ifndef __com_sun_star_util_NotNumericException_idl__
#include <com/sun/star/util/NotNumericException.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index 93d994eb6e0f..ea729b478d5e 100644
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
#define __com_sun_star_util_XOfficeInstallationDirectories_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XPropertyReplace.idl b/offapi/com/sun/star/util/XPropertyReplace.idl
index 7be1114220f3..29308d8e2c17 100644
--- a/offapi/com/sun/star/util/XPropertyReplace.idl
+++ b/offapi/com/sun/star/util/XPropertyReplace.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_util_XPropertyReplace_idl__
#define __com_sun_star_util_XPropertyReplace_idl__
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XProtectable.idl b/offapi/com/sun/star/util/XProtectable.idl
index 57685a168bf5..cb81204ea2d7 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XProtectable_idl__
#define __com_sun_star_util_XProtectable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XRefreshListener.idl b/offapi/com/sun/star/util/XRefreshListener.idl
index 8286583015e1..2d2548dd9f19 100644
--- a/offapi/com/sun/star/util/XRefreshListener.idl
+++ b/offapi/com/sun/star/util/XRefreshListener.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XRefreshListener_idl__
#define __com_sun_star_util_XRefreshListener_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/util/XRefreshable.idl b/offapi/com/sun/star/util/XRefreshable.idl
index 1ed7e497a433..a99ae6f8fcc6 100644
--- a/offapi/com/sun/star/util/XRefreshable.idl
+++ b/offapi/com/sun/star/util/XRefreshable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XRefreshable_idl__
#define __com_sun_star_util_XRefreshable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XRefreshListener_idl__
#include <com/sun/star/util/XRefreshListener.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceDescriptor.idl b/offapi/com/sun/star/util/XReplaceDescriptor.idl
index e3bb662a2a0a..68d1a75293a1 100644
--- a/offapi/com/sun/star/util/XReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/XReplaceDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#define __com_sun_star_util_XReplaceDescriptor_idl__
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceable.idl b/offapi/com/sun/star/util/XReplaceable.idl
index 847a7bf9e1b0..994fde57690a 100644
--- a/offapi/com/sun/star/util/XReplaceable.idl
+++ b/offapi/com/sun/star/util/XReplaceable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XReplaceable_idl__
#define __com_sun_star_util_XReplaceable_idl__
-#ifndef __com_sun_star_util_XSearchable_idl__
#include <com/sun/star/util/XSearchable.idl>
-#endif
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSearchDescriptor.idl b/offapi/com/sun/star/util/XSearchDescriptor.idl
index dde3589773dd..07979aefb038 100644
--- a/offapi/com/sun/star/util/XSearchDescriptor.idl
+++ b/offapi/com/sun/star/util/XSearchDescriptor.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#define __com_sun_star_util_XSearchDescriptor_idl__
-#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSearchable.idl b/offapi/com/sun/star/util/XSearchable.idl
index fce6b411ce9c..87c8dc511a11 100644
--- a/offapi/com/sun/star/util/XSearchable.idl
+++ b/offapi/com/sun/star/util/XSearchable.idl
@@ -27,17 +27,11 @@
#ifndef __com_sun_star_util_XSearchable_idl__
#define __com_sun_star_util_XSearchable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSimpleErrorHandler.idl b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
index 1d3953d6ce14..e994aabf6836 100644
--- a/offapi/com/sun/star/util/XSimpleErrorHandler.idl
+++ b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XSimpleErrorHandler_idl__
#define __com_sun_star_util_XSimpleErrorHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XSortable.idl b/offapi/com/sun/star/util/XSortable.idl
index 3e34db69d57f..3acfe51fd91f 100644
--- a/offapi/com/sun/star/util/XSortable.idl
+++ b/offapi/com/sun/star/util/XSortable.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XSortable_idl__
#define __com_sun_star_util_XSortable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringAbbreviation.idl b/offapi/com/sun/star/util/XStringAbbreviation.idl
index 076b84b033c5..a5ba1d04dac5 100644
--- a/offapi/com/sun/star/util/XStringAbbreviation.idl
+++ b/offapi/com/sun/star/util/XStringAbbreviation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XStringAbbreviation_idl__
#define __com_sun_star_util_XStringAbbreviation_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
published interface XStringWidth;
diff --git a/offapi/com/sun/star/util/XStringEscape.idl b/offapi/com/sun/star/util/XStringEscape.idl
index f73bf84c59ae..79742a47c63b 100644
--- a/offapi/com/sun/star/util/XStringEscape.idl
+++ b/offapi/com/sun/star/util/XStringEscape.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_util_XStringEscape_idl__
#define __com_sun_star_util_XStringEscape_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringMapping.idl b/offapi/com/sun/star/util/XStringMapping.idl
index b6afc14642e7..901ff3ac73e0 100644
--- a/offapi/com/sun/star/util/XStringMapping.idl
+++ b/offapi/com/sun/star/util/XStringMapping.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_util_XStringMapping_idl__
#define __com_sun_star_util_XStringMapping_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringSubstitution.idl b/offapi/com/sun/star/util/XStringSubstitution.idl
index 18a84233af59..5b3c2dd6b99f 100644
--- a/offapi/com/sun/star/util/XStringSubstitution.idl
+++ b/offapi/com/sun/star/util/XStringSubstitution.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_util_XStringSubstitution_idl__
#define __com_sun_star_util_XStringSubstitution_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XStringWidth.idl b/offapi/com/sun/star/util/XStringWidth.idl
index 81d76dd79475..4b2414f1ed71 100644
--- a/offapi/com/sun/star/util/XStringWidth.idl
+++ b/offapi/com/sun/star/util/XStringWidth.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XStringWidth_idl__
#define __com_sun_star_util_XStringWidth_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XTimeStamped.idl b/offapi/com/sun/star/util/XTimeStamped.idl
index 39b2f3f5085b..6cabc0e345d9 100644
--- a/offapi/com/sun/star/util/XTimeStamped.idl
+++ b/offapi/com/sun/star/util/XTimeStamped.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_util_XTimeStamped_idl__
#define __com_sun_star_util_XTimeStamped_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module util {
diff --git a/offapi/com/sun/star/util/XURLTransformer.idl b/offapi/com/sun/star/util/XURLTransformer.idl
index 947f38596827..d762f3682d59 100644
--- a/offapi/com/sun/star/util/XURLTransformer.idl
+++ b/offapi/com/sun/star/util/XURLTransformer.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XURLTransformer_idl__
#define __com_sun_star_util_XURLTransformer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
#include <com/sun/star/util/URL.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index e79c36ab9c09..4cccd126b69d 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_container_XUniqueIDFactory_idl__
#define __com_sun_star_container_XUniqueIDFactory_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/util/XUpdatable.idl b/offapi/com/sun/star/util/XUpdatable.idl
index ed221a36ecdd..b6c3cee4c8f5 100644
--- a/offapi/com/sun/star/util/XUpdatable.idl
+++ b/offapi/com/sun/star/util/XUpdatable.idl
@@ -27,13 +27,8 @@
#ifndef __com_sun_star_util_XUpdatable_idl__
#define __com_sun_star_util_XUpdatable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshListener_idl__
#include <com/sun/star/util/XRefreshListener.idl>
-#endif
//=============================================================================