summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-12-12 12:36:45 +0200
committerNoel Grandin <noel@peralex.com>2012-12-21 09:12:07 +0200
commit2a1b850b789a386fe77fecf8c4c2bfb0a4d099dc (patch)
tree76baaf5f6ee4ba6f8edf248bfc0fbca9a4f9505b /offapi/com/sun/star
parente93a0018871ebea4da1959c72c06f3c7f4dc7b27 (diff)
clean up all the UNO IDL module header guards
.. so I don't keep tripping over the bad ones during my UNO cleanup work. (1) make them all use a similar syntax, makes it easier to run my automatic checker (2) some of them were just cut'n'paste accidents waiting to happen (3) remove unnecessary header guards in the __including__ file. That is very brittle. Change-Id: I4e679c15161483ad93aeb316a25d6db6d97e9d4e
Diffstat (limited to 'offapi/com/sun/star')
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl4
-rw-r--r--offapi/com/sun/star/animations/TargetPropertiesCreator.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTextField.idl4
-rw-r--r--offapi/com/sun/star/awt/AccessibleToolBox.idl4
-rw-r--r--offapi/com/sun/star/awt/ItemListEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlButton.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlCheckBox.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlComboBox.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlCurrencyField.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlDateField.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlFileControl.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedLine.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlFixedText.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlGroupBox.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlImageControl.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlListBox.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlPatternField.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlProgressBar.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlRadioButton.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlScrollBar.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlSpinButton.idl4
-rw-r--r--offapi/com/sun/star/awt/UnoControlTimeField.idl4
-rw-r--r--offapi/com/sun/star/awt/XItemList.idl4
-rw-r--r--offapi/com/sun/star/awt/XItemListListener.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/GridColumn.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/GridSelectionEvent.idl4
-rw-r--r--offapi/com/sun/star/awt/grid/UnoControlGrid.idl6
-rw-r--r--offapi/com/sun/star/awt/grid/XGridRowSelection.idl4
-rw-r--r--offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl4
-rw-r--r--offapi/com/sun/star/chart2/Axis.idl4
-rw-r--r--offapi/com/sun/star/chart2/ChartTypeManager.idl4
-rw-r--r--offapi/com/sun/star/chart2/ChartTypeTemplate.idl4
-rw-r--r--offapi/com/sun/star/chart2/Diagram.idl4
-rw-r--r--offapi/com/sun/star/chart2/ErrorBar.idl4
-rw-r--r--offapi/com/sun/star/chart2/FormattedString.idl4
-rw-r--r--offapi/com/sun/star/chart2/GridProperties.idl4
-rw-r--r--offapi/com/sun/star/chart2/LegendPosition.idl4
-rw-r--r--offapi/com/sun/star/chart2/LightSource.idl4
-rw-r--r--offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl4
-rw-r--r--offapi/com/sun/star/chart2/Title.idl4
-rw-r--r--offapi/com/sun/star/chart2/XChartTypeManager.idl4
-rw-r--r--offapi/com/sun/star/chart2/XChartTypeTemplate.idl4
-rw-r--r--offapi/com/sun/star/chart2/XFormattedString.idl4
-rw-r--r--offapi/com/sun/star/chart2/XLegend.idl4
-rw-r--r--offapi/com/sun/star/chart2/XTitle.idl4
-rw-r--r--offapi/com/sun/star/chart2/XTitled.idl4
-rw-r--r--offapi/com/sun/star/chart2/data/DataProvider.idl4
-rw-r--r--offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl4
-rw-r--r--offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl4
-rw-r--r--offapi/com/sun/star/configuration/AdministrationProvider.idl4
-rw-r--r--offapi/com/sun/star/configuration/ReadOnlyAccess.idl4
-rw-r--r--offapi/com/sun/star/configuration/ReadWriteAccess.idl4
-rw-r--r--offapi/com/sun/star/configuration/XReadWriteAccess.idl4
-rw-r--r--offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl4
-rw-r--r--offapi/com/sun/star/configuration/theDefaultProvider.idl4
-rw-r--r--offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl4
-rw-r--r--offapi/com/sun/star/datatransfer/XTransferDataAccess.idl4
-rw-r--r--offapi/com/sun/star/deployment/DependencyException.idl4
-rw-r--r--offapi/com/sun/star/deployment/DeploymentException.idl4
-rw-r--r--offapi/com/sun/star/deployment/ExtensionManager.idl4
-rw-r--r--offapi/com/sun/star/deployment/ExtensionRemovedException.idl4
-rw-r--r--offapi/com/sun/star/deployment/InstallException.idl4
-rw-r--r--offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl4
-rw-r--r--offapi/com/sun/star/deployment/LicenseException.idl4
-rw-r--r--offapi/com/sun/star/deployment/PackageRegistryBackend.idl4
-rw-r--r--offapi/com/sun/star/deployment/PlatformException.idl4
-rw-r--r--offapi/com/sun/star/deployment/VersionException.idl4
-rw-r--r--offapi/com/sun/star/deployment/XExtensionManager.idl4
-rw-r--r--offapi/com/sun/star/deployment/XPackage.idl4
-rw-r--r--offapi/com/sun/star/deployment/XPackageManager.idl4
-rw-r--r--offapi/com/sun/star/deployment/XPackageManagerFactory.idl4
-rw-r--r--offapi/com/sun/star/deployment/XPackageRegistry.idl4
-rw-r--r--offapi/com/sun/star/deployment/XPackageTypeInfo.idl4
-rw-r--r--offapi/com/sun/star/deployment/thePackageManagerFactory.idl4
-rw-r--r--offapi/com/sun/star/deployment/ui/LicenseDialog.idl4
-rw-r--r--offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl4
-rw-r--r--offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl4
-rw-r--r--offapi/com/sun/star/document/FilterAdapter.idl4
-rw-r--r--offapi/com/sun/star/document/FilterOptionsRequest.idl4
-rw-r--r--offapi/com/sun/star/document/XCmisDocument.idl4
-rw-r--r--offapi/com/sun/star/document/XDocumentRecovery.idl4
-rw-r--r--offapi/com/sun/star/document/XFilterAdapter.idl4
-rw-r--r--offapi/com/sun/star/document/XStorageBasedDocument.idl4
-rw-r--r--offapi/com/sun/star/document/XVbaMethodParameter.idl4
-rw-r--r--offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl4
-rw-r--r--offapi/com/sun/star/drawing/AccessibleOLEShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideView.idl4
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl4
-rw-r--r--offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl4
-rw-r--r--offapi/com/sun/star/drawing/XSlideSorterBase.idl12
-rw-r--r--offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl4
-rw-r--r--offapi/com/sun/star/drawing/framework/Configuration.idl4
-rw-r--r--offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl14
-rw-r--r--offapi/com/sun/star/form/control/CheckBox.idl4
-rw-r--r--offapi/com/sun/star/form/control/InteractionGridControl.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl4
-rw-r--r--offapi/com/sun/star/form/inspection/EventHandler.idl4
-rw-r--r--offapi/com/sun/star/form/runtime/FormController.idl4
-rw-r--r--offapi/com/sun/star/form/runtime/XFilterController.idl4
-rw-r--r--offapi/com/sun/star/form/runtime/XFormController.idl4
-rw-r--r--offapi/com/sun/star/form/runtime/XFormControllerContext.idl4
-rw-r--r--offapi/com/sun/star/formula/AccessibleFormulaView.idl4
-rw-r--r--offapi/com/sun/star/formula/SymbolDescriptor.idl4
-rw-r--r--offapi/com/sun/star/frame/XMenuBarAcceptor.idl4
-rw-r--r--offapi/com/sun/star/frame/status/ItemStatus.idl4
-rw-r--r--offapi/com/sun/star/i18n/OrdinalSuffix.idl4
-rw-r--r--offapi/com/sun/star/i18n/TextConversionResult.idl4
-rw-r--r--offapi/com/sun/star/i18n/XOrdinalSuffix.idl4
-rw-r--r--offapi/com/sun/star/logging/XConsoleHandler.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XCodeProxy.idl4
-rw-r--r--offapi/com/sun/star/packages/zip/ZipConstants.idl4
-rw-r--r--offapi/com/sun/star/rendering/ARGBColor.idl2
-rw-r--r--offapi/com/sun/star/rendering/BitmapCanvas.idl4
-rw-r--r--offapi/com/sun/star/rendering/Canvas.idl2
-rw-r--r--offapi/com/sun/star/rendering/CanvasFactory.idl4
-rw-r--r--offapi/com/sun/star/rendering/Color.idl2
-rw-r--r--offapi/com/sun/star/rendering/RGBColor.idl2
-rw-r--r--offapi/com/sun/star/rendering/TexturingMode.idl4
-rw-r--r--offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl2
-rw-r--r--offapi/com/sun/star/resource/StringResource.idl4
-rw-r--r--offapi/com/sun/star/script/ModuleSizeExceededRequest.idl4
-rw-r--r--offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl4
-rw-r--r--offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl4
-rw-r--r--offapi/com/sun/star/sdb/Document.idl4
-rw-r--r--offapi/com/sun/star/sdb/DocumentDefinition.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/DefaultViewController.idl4
-rw-r--r--offapi/com/sun/star/sdb/application/XTableUIProvider.idl4
-rw-r--r--offapi/com/sun/star/sdb/tools/CompositionType.idl4
-rw-r--r--offapi/com/sun/star/sdbcx/XAlterView.idl4
-rw-r--r--offapi/com/sun/star/security/CertificateContainer.idl4
-rw-r--r--offapi/com/sun/star/security/XCertificateContainer.idl4
-rw-r--r--offapi/com/sun/star/sheet/DataPilotDescriptor.idl4
-rw-r--r--offapi/com/sun/star/sheet/XSpreadsheets2.idl4
-rw-r--r--offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl11
-rw-r--r--offapi/com/sun/star/style/CharacterPropertiesComplex.idl4
-rw-r--r--offapi/com/sun/star/style/XStyleSupplier.idl6
-rw-r--r--offapi/com/sun/star/svg/XSVGPrinter.idl4
-rw-r--r--offapi/com/sun/star/svg/XSVGWriter.idl4
-rw-r--r--offapi/com/sun/star/table/AccessibleCellView.idl4
-rw-r--r--offapi/com/sun/star/table/AccessibleTableView.idl4
-rw-r--r--offapi/com/sun/star/table/CellRangeListSource.idl4
-rw-r--r--offapi/com/sun/star/table/CellVertJustify2.idl4
-rw-r--r--offapi/com/sun/star/task/NoMasterException.idl4
-rw-r--r--offapi/com/sun/star/task/XAbortChannel.idl4
-rw-r--r--offapi/com/sun/star/text/AccessiblePageView.idl4
-rw-r--r--offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl4
-rw-r--r--offapi/com/sun/star/text/AccessibleTextGraphicObject.idl4
-rw-r--r--offapi/com/sun/star/text/DocumentIndexLevelFormat.idl4
-rw-r--r--offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl4
-rw-r--r--offapi/com/sun/star/text/DocumentSettings.idl4
-rw-r--r--offapi/com/sun/star/text/GlobalSettings.idl4
-rw-r--r--offapi/com/sun/star/text/NumberingStyle.idl4
-rw-r--r--offapi/com/sun/star/text/TableColumns.idl4
-rw-r--r--offapi/com/sun/star/text/TableRows.idl4
-rw-r--r--offapi/com/sun/star/text/TextSortable.idl4
-rw-r--r--offapi/com/sun/star/text/XTextCopy.idl4
-rw-r--r--offapi/com/sun/star/text/fieldmaster/User.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/DropDown.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/EditTime.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl4
-rw-r--r--offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl4
-rw-r--r--offapi/com/sun/star/ucb/ExpandContentProvider.idl4
-rw-r--r--offapi/com/sun/star/ucb/InteractiveAppException.idl4
-rw-r--r--offapi/com/sun/star/ui/ModuleUICategoryDescription.idl4
-rw-r--r--offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl4
-rw-r--r--offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl4
-rw-r--r--offapi/com/sun/star/ui/XUIFunctionListener.idl4
-rw-r--r--offapi/com/sun/star/ui/dialogs/ControlActions.idl4
-rw-r--r--offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl4
-rw-r--r--offapi/com/sun/star/util/JobManager.idl4
-rw-r--r--offapi/com/sun/star/util/SearchAlgorithms.idl4
-rw-r--r--offapi/com/sun/star/util/SearchFlags.idl4
-rw-r--r--offapi/com/sun/star/util/SearchOptions.idl4
-rw-r--r--offapi/com/sun/star/util/SearchResult.idl4
-rw-r--r--offapi/com/sun/star/util/UriAbbreviation.idl4
-rw-r--r--offapi/com/sun/star/util/XCloseable.idl4
-rw-r--r--offapi/com/sun/star/util/XTextSearch.idl4
-rw-r--r--offapi/com/sun/star/util/XUniqueIDFactory.idl4
-rw-r--r--offapi/com/sun/star/view/XFormLayerAccess.idl4
-rw-r--r--offapi/com/sun/star/xforms/XDataTypeRepository.idl4
-rw-r--r--offapi/com/sun/star/xforms/XSubmission.idl4
-rw-r--r--offapi/com/sun/star/xml/AttributeContainer.idl4
-rw-r--r--offapi/com/sun/star/xml/NamespaceContainer.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XCipherContext.idl8
-rw-r--r--offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl11
-rw-r--r--offapi/com/sun/star/xml/crypto/XDigestContext.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl11
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XEntity.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XEntityReference.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/events/XEvent.idl4
-rw-r--r--offapi/com/sun/star/xml/input/SaxDocumentHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/input/XAttributes.idl4
-rw-r--r--offapi/com/sun/star/xml/input/XElement.idl4
-rw-r--r--offapi/com/sun/star/xml/input/XNamespaceMapping.idl4
-rw-r--r--offapi/com/sun/star/xml/input/XRoot.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/FastToken.idl4
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathAPI.idl3
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathExtension.idl3
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathObjectType.idl4
-rw-r--r--offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl4
-rw-r--r--offapi/com/sun/star/xml/xslt/XSLTTransformer.idl4
-rw-r--r--offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl4
214 files changed, 401 insertions, 489 deletions
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 19536b0e265b..cef7f8204d3d 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
-#define __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
+#ifndef __com_sun_star_accessibility_AccessibleTableModelChangeType_idl__
+#define __com_sun_star_accessibility_AccessibleTableModelChangeType_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
index 6f7169ffb3bf..d40d765b60a2 100644
--- a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
@@ -20,9 +20,7 @@
#ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__
#define __com_sun_star_animations_TargetPropertiesCreator_idl__
-#ifndef __com_sun_star_animations_TargetProperties_idl__
#include <com/sun/star/animations/XTargetPropertiesCreator.idl>
-#endif
module com { module sun { module star { module animations {
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 0e5f90e5ff33..a8c02767f37a 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_accessibility_AccessibleTextField_idl__
-#define __com_sun_star_accessibility_AccessibleTextField_idl__
+#ifndef __com_sun_star_awt_AccessibleTextField_idl__
+#define __com_sun_star_awt_AccessibleTextField_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index 9cc3a463340e..3e40842e666b 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_accessibility_AccessibleToolBox_idl__
-#define __com_sun_star_accessibility_AccessibleToolBox_idl__
+#ifndef __com_sun_star_awt_AccessibleToolBox_idl__
+#define __com_sun_star_awt_AccessibleToolBox_idl__
#include <com/sun/star/accessibility/AccessibleContext.idl>
diff --git a/offapi/com/sun/star/awt/ItemListEvent.idl b/offapi/com/sun/star/awt/ItemListEvent.idl
index f8a996acf184..e8b8406676f9 100644
--- a/offapi/com/sun/star/awt/ItemListEvent.idl
+++ b/offapi/com/sun/star/awt/ItemListEvent.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_awt_ListItemEvent_idl__
-#define __offapi_com_sun_star_awt_ListItemEvent_idl__
+#ifndef __com_sun_star_awt_ItemListEvent_idl__
+#define __com_sun_star_awt_ItemListEvent_idl__
#include <com/sun/star/lang/EventObject.idl>
#include <com/sun/star/beans/Optional.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index 6e6fb28d7b95..80aee22c894d 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlButton_idl__
+#define __com_sun_star_awt_UnoControlButton_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index ff54bd2f1e30..9b2554f67f80 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__
-#define __com_sun_star_awt_UnoCheckBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
+#define __com_sun_star_awt_UnoControlCheckBox_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 3908fa443b85..685053465fba 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoComboBoxControl_idl__
-#define __com_sun_star_awt_UnoComboBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
+#define __com_sun_star_awt_UnoControlComboBox_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index 9acba253c4a8..0099f7c46dc5 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__
-#define __com_sun_star_awt_UnoCurrencyFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
+#define __com_sun_star_awt_UnoControlCurrencyField_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
#include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index 41e30940fd6a..058f350c854e 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoDateFieldControl_idl__
-#define __com_sun_star_awt_UnoDateFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlDateField_idl__
+#define __com_sun_star_awt_UnoControlDateField_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
#include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index 900484b38dda..69513e59701e 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoFileControl_idl__
-#define __com_sun_star_awt_UnoFileControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFileControl_idl__
+#define __com_sun_star_awt_UnoControlFileControl_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index 6eff23a31c91..9f076f2b9730 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
-#define __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedHyperlink_idl__
+#define __com_sun_star_awt_UnoControlFixedHyperlink_idl__
#include <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/XFixedHyperlink.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index e819e178c7f7..3c8885c5cb4e 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoFixedLineControl_idl__
-#define __com_sun_star_awt_UnoFixedLineControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedLine_idl__
+#define __com_sun_star_awt_UnoControlFixedLine_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index 55b6498883f6..732e2cd8ec99 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoFixedTextControl_idl__
-#define __com_sun_star_awt_UnoFixedTextControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedText_idl__
+#define __com_sun_star_awt_UnoControlFixedText_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index 410574844ea8..10a7c0de99c0 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__
-#define __com_sun_star_awt_UnoGroupBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
+#define __com_sun_star_awt_UnoControlGroupBox_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index 30282ca99ca4..ff53a5ea6d63 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoImageControl_idl__
-#define __com_sun_star_awt_UnoImageControl_idl__
+#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
+#define __com_sun_star_awt_UnoControlImageControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/XLayoutConstrains.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index 4516886b81dd..37327b47e132 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoListBoxControl_idl__
-#define __com_sun_star_awt_UnoListBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlListBox_idl__
+#define __com_sun_star_awt_UnoControlListBox_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index ecf48d98c118..4254eda792eb 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__
-#define __com_sun_star_awt_UnoPatternFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
+#define __com_sun_star_awt_UnoControlPatternField_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
#include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index 46712332c5ca..87e906396d44 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoProgressBarControl_idl__
-#define __com_sun_star_awt_UnoProgressBarControl_idl__
+#ifndef __com_sun_star_awt_UnoControlProgressBar_idl__
+#define __com_sun_star_awt_UnoControlProgressBar_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index ca2f507da2c7..c14f40c3b5c8 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
+#define __com_sun_star_awt_UnoControlRadioButton_idl__
#include <com/sun/star/awt/UnoControl.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index fd2e7ea403bb..2ea1f2acf5cd 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoScrollBarControl_idl__
-#define __com_sun_star_awt_UnoScrollBarControl_idl__
+#ifndef __com_sun_star_awt_UnoControlScrollBar_idl__
+#define __com_sun_star_awt_UnoControlScrollBar_idl__
#include <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/XScrollBar.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index 8bea87af49a0..c14a9c50b944 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoSpinButtonControl_idl__
-#define __com_sun_star_awt_UnoSpinButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlSpinButton_idl__
+#define __com_sun_star_awt_UnoControlSpinButton_idl__
#include <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/XSpinValue.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index d47576d360b0..1c37e99a6e69 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__
-#define __com_sun_star_awt_UnoTimeFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
+#define __com_sun_star_awt_UnoControlTimeField_idl__
#include <com/sun/star/awt/UnoControlEdit.idl>
#include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 976741cd407b..95bfd2118b90 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_awt_XItemList_idl__
-#define __offapi_com_sun_star_awt_XItemList_idl__
+#ifndef __com_sun_star_awt_XItemList_idl__
+#define __com_sun_star_awt_XItemList_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
#include <com/sun/star/beans/Pair.idl>
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
index 89d21b0d98e1..96143a38a779 100644
--- a/offapi/com/sun/star/awt/XItemListListener.idl
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_awt_XItemListListener_idl__
-#define __offapi_com_sun_star_awt_XItemListListener_idl__
+#ifndef __com_sun_star_awt_XItemListListener_idl__
+#define __com_sun_star_awt_XItemListListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
#include <com/sun/star/awt/ItemListEvent.idl>
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 44065b0c75e4..faf81433b887 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_DefaultGridColumnModel_idl__
-#define __com_sun_star_awt_DefaultGridColumnModel_idl__
+#ifndef __com_sun_star_awt_grid_DefaultGridColumnModel_idl__
+#define __com_sun_star_awt_grid_DefaultGridColumnModel_idl__
#include <com/sun/star/awt/grid/XGridColumnModel.idl>
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index 79d81ddc33ed..e9029b08123c 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_DefaultGridDataModel_idl__
-#define __com_sun_star_awt_DefaultGridDataModel_idl__
+#ifndef __com_sun_star_awt_grid_DefaultGridDataModel_idl__
+#define __com_sun_star_awt_grid_DefaultGridDataModel_idl__
#include <com/sun/star/awt/grid/XMutableGridDataModel.idl>
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index de844fd862ff..5ec80bbca7ff 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_GridColumn_idl__
-#define __com_sun_star_awt_GridColumn_idl__
+#ifndef __com_sun_star_awt_grid_GridColumn_idl__
+#define __com_sun_star_awt_grid_GridColumn_idl__
#include <com/sun/star/awt/grid/XGridColumn.idl>
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index 504a5e18ab83..38af99175c1f 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_GridSelectionEvent_idl__
-#define __com_sun_star_awt_GridSelectionEvent_idl__
+#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
+#define __com_sun_star_awt_grid_GridSelectionEvent_idl__
#include <com/sun/star/lang/EventObject.idl>
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index e70a65e86cdb..98e30d5df5f1 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -16,16 +16,14 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_UnoControlGrid_idl__
-#define __com_sun_star_awt_UnoControlGrid_idl__
+#ifndef __com_sun_star_awt_grid_UnoControlGrid_idl__
+#define __com_sun_star_awt_grid_UnoControlGrid_idl__
#include <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/grid/XGridControl.idl>
-#ifndef __com_sun_star_awt_grid_XGridRowSelection_idl__
#include <com/sun/star/awt/grid/XGridRowSelection.idl>
-#endif
module com { module sun { module star { module awt { module grid {
diff --git a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
index 5f137d13245b..af755973162e 100644
--- a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_grid_XGridSelection_idl__
-#define __com_sun_star_awt_grid_XGridSelection_idl__
+#ifndef __com_sun_star_awt_grid_XGridRowSelection_idl__
+#define __com_sun_star_awt_grid_XGridRowSelection_idl__
#include <com/sun/star/awt/grid/XGridSelectionListener.idl>
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index b51916c62bb7..030815b7da43 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_awt_tab_TabPageActivationEvent_idl__
-#define __com_sun_star_awt_tab_TabPageActivationEvent_idl__
+#ifndef __com_sun_star_awt_tab_TabPageActivatedEvent_idl__
+#define __com_sun_star_awt_tab_TabPageActivatedEvent_idl__
#include <com/sun/star/lang/EventObject.idl>
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index 3c3a0a3197db..9fb4a20f6c1b 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_Axis_idl
-#define com_sun_star_chart_Axis_idl
+#ifndef com_sun_star_chart2_Axis_idl
+#define com_sun_star_chart2_Axis_idl
#include <com/sun/star/beans/PropertySet.idl>
#include <com/sun/star/awt/Size.idl>
diff --git a/offapi/com/sun/star/chart2/ChartTypeManager.idl b/offapi/com/sun/star/chart2/ChartTypeManager.idl
index ac9a970892f6..12b90737aa59 100644
--- a/offapi/com/sun/star/chart2/ChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/ChartTypeManager.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_ChartTypeManager_idl
-#define com_sun_star_chart_ChartTypeManager_idl
+#ifndef com_sun_star_chart2_ChartTypeManager_idl
+#define com_sun_star_chart2_ChartTypeManager_idl
#include <com/sun/star/lang/MultiServiceFactory.idl>
diff --git a/offapi/com/sun/star/chart2/ChartTypeTemplate.idl b/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
index ea4048c22420..e2f74c2ba532 100644
--- a/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_ChartTypeTemplate_idl
-#define com_sun_star_chart_ChartTypeTemplate_idl
+#ifndef com_sun_star_chart2_ChartTypeTemplate_idl
+#define com_sun_star_chart2_ChartTypeTemplate_idl
#include <com/sun/star/chart2/XChartTypeTemplate.idl>
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 84c2ce798992..e820364a3cf9 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_Diagram_idl
-#define com_sun_star_chart_Diagram_idl
+#ifndef com_sun_star_chart2_Diagram_idl
+#define com_sun_star_chart2_Diagram_idl
#include <com/sun/star/chart2/XDiagram.idl>
#include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
diff --git a/offapi/com/sun/star/chart2/ErrorBar.idl b/offapi/com/sun/star/chart2/ErrorBar.idl
index ee73dec0ffd7..384bb4f30ab3 100644
--- a/offapi/com/sun/star/chart2/ErrorBar.idl
+++ b/offapi/com/sun/star/chart2/ErrorBar.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_ErrorBar_idl
-#define com_sun_star_chart_ErrorBar_idl
+#ifndef com_sun_star_chart2_ErrorBar_idl
+#define com_sun_star_chart2_ErrorBar_idl
#include <com/sun/star/drawing/LineProperties.idl>
#include <com/sun/star/chart/ErrorBarStyle.idl>
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 21fb90df703f..e4be3c7de08a 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_FormattedString_idl
-#define com_sun_star_chart_FormattedString_idl
+#ifndef com_sun_star_chart2_FormattedString_idl
+#define com_sun_star_chart2_FormattedString_idl
#include <com/sun/star/beans/PropertySet.idl>
#include <com/sun/star/style/CharacterProperties.idl>
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index 74a702148780..0db23604d409 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_GridProperties_idl
-#define com_sun_star_chart_GridProperties_idl
+#ifndef com_sun_star_chart2_GridProperties_idl
+#define com_sun_star_chart2_GridProperties_idl
#include <com/sun/star/drawing/LineProperties.idl>
diff --git a/offapi/com/sun/star/chart2/LegendPosition.idl b/offapi/com/sun/star/chart2/LegendPosition.idl
index 6e088e9afdda..16bac1780ed2 100644
--- a/offapi/com/sun/star/chart2/LegendPosition.idl
+++ b/offapi/com/sun/star/chart2/LegendPosition.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_LegendPosition_idl
-#define com_sun_star_chart_LegendPosition_idl
+#ifndef com_sun_star_chart2_LegendPosition_idl
+#define com_sun_star_chart2_LegendPosition_idl
module com
{
diff --git a/offapi/com/sun/star/chart2/LightSource.idl b/offapi/com/sun/star/chart2/LightSource.idl
index 500bd3fe8b43..091298266b16 100644
--- a/offapi/com/sun/star/chart2/LightSource.idl
+++ b/offapi/com/sun/star/chart2/LightSource.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_LightSource_idl
-#define com_sun_star_chart_LightSource_idl
+#ifndef com_sun_star_chart2_LightSource_idl
+#define com_sun_star_chart2_LightSource_idl
#include <com/sun/star/drawing/Direction3D.idl>
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index 830fba778d40..a9e467210ec6 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_StandardDiagramCreationParameters_idl
-#define com_sun_star_chart_StandardDiagramCreationParameters_idl
+#ifndef com_sun_star_chart2_StandardDiagramCreationParameters_idl
+#define com_sun_star_chart2_StandardDiagramCreationParameters_idl
#include <com/sun/star/beans/PropertyValue.idl>
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index 3a12eb255a06..24bcfd5dce98 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_Title_idl
-#define com_sun_star_chart_Title_idl
+#ifndef com_sun_star_chart2_Title_idl
+#define com_sun_star_chart2_Title_idl
#include <com/sun/star/style/ParagraphProperties.idl>
#include <com/sun/star/chart2/XTitle.idl>
diff --git a/offapi/com/sun/star/chart2/XChartTypeManager.idl b/offapi/com/sun/star/chart2/XChartTypeManager.idl
index 2792af515081..abafeb34640b 100644
--- a/offapi/com/sun/star/chart2/XChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeManager.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XChartTypeManager_idl
-#define com_sun_star_chart_XChartTypeManager_idl
+#ifndef com_sun_star_chart2_XChartTypeManager_idl
+#define com_sun_star_chart2_XChartTypeManager_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index f523b08442ba..b2765e2885aa 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XChartTypeTemplate_idl
-#define com_sun_star_chart_XChartTypeTemplate_idl
+#ifndef com_sun_star_chart2_XChartTypeTemplate_idl
+#define com_sun_star_chart2_XChartTypeTemplate_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
diff --git a/offapi/com/sun/star/chart2/XFormattedString.idl b/offapi/com/sun/star/chart2/XFormattedString.idl
index 7d8b3d889b4a..f8427b9d3b60 100644
--- a/offapi/com/sun/star/chart2/XFormattedString.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XFormattedString_idl
-#define com_sun_star_chart_XFormattedString_idl
+#ifndef com_sun_star_chart2_XFormattedString_idl
+#define com_sun_star_chart2_XFormattedString_idl
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/chart2/XLegend.idl b/offapi/com/sun/star/chart2/XLegend.idl
index fd5c0120f17e..4db147376359 100644
--- a/offapi/com/sun/star/chart2/XLegend.idl
+++ b/offapi/com/sun/star/chart2/XLegend.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XLegend_idl
-#define com_sun_star_chart_XLegend_idl
+#ifndef com_sun_star_chart2_XLegend_idl
+#define com_sun_star_chart2_XLegend_idl
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 6ae581d35f56..e663755485a2 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XTitle_idl
-#define com_sun_star_chart_XTitle_idl
+#ifndef com_sun_star_chart2_XTitle_idl
+#define com_sun_star_chart2_XTitle_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/chart2/XFormattedString.idl>
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index 9795cace1b0d..3a5ec1883c26 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_XTitled_idl
-#define com_sun_star_chart_XTitled_idl
+#ifndef com_sun_star_chart2_XTitled_idl
+#define com_sun_star_chart2_XTitled_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/chart2/XTitle.idl>
diff --git a/offapi/com/sun/star/chart2/data/DataProvider.idl b/offapi/com/sun/star/chart2/data/DataProvider.idl
index dd1689d3cecf..34ba0becd9aa 100644
--- a/offapi/com/sun/star/chart2/data/DataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DataProvider.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef com_sun_star_chart_data_DataProvider_idl
-#define com_sun_star_chart_data_DataProvider_idl
+#ifndef com_sun_star_chart2_data_DataProvider_idl
+#define com_sun_star_chart2_data_DataProvider_idl
#include <com/sun/star/chart2/data/XDataProvider.idl>
#include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
index 2a34af29553d..a9bf0fee44e0 100644
--- a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
-#define __com_sun_star_report_DatabaseDataProvider_idl__
+#ifndef __com_sun_star_chart2_data_DatabaseDataProvider_idl__
+#define __com_sun_star_chart2_data_DatabaseDataProvider_idl__
#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 9e625d9e090e..0710ff50e074 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_report_XDatabaseDataProvider_idl__
-#define __com_sun_star_report_XDatabaseDataProvider_idl__
+#ifndef __com_sun_star_chart2_data_XDatabaseDataProvider_idl__
+#define __com_sun_star_chart2_data_XDatabaseDataProvider_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
#include <com/sun/star/beans/XPropertySet.idl>
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 79a90ba2ccf4..6fcb945a05e1 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
-#define __com_sun_star_configuration_ConfigurationProvider_idl__
+#ifndef __com_sun_star_configuration_AdministrationProvider_idl__
+#define __com_sun_star_configuration_AdministrationProvider_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
#include <com/sun/star/lang/XComponent.idl>
diff --git a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
index dc47c68b5980..d833e1436704 100644
--- a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
@@ -27,8 +27,8 @@
* instead of those above.
*/
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
#include <com/sun/star/container/XHierarchicalNameAccess.idl>
diff --git a/offapi/com/sun/star/configuration/ReadWriteAccess.idl b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
index f9a3a034fc1e..3c48999af496 100644
--- a/offapi/com/sun/star/configuration/ReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
@@ -27,8 +27,8 @@
* instead of those above.
*/
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
#include <com/sun/star/configuration/XReadWriteAccess.idl>
diff --git a/offapi/com/sun/star/configuration/XReadWriteAccess.idl b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
index c5e8c31ebba7..7c3bd733ea64 100644
--- a/offapi/com/sun/star/configuration/XReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
@@ -27,8 +27,8 @@
* instead of those above.
*/
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
#include <com/sun/star/container/XHierarchicalNameReplace.idl>
#include <com/sun/star/util/XChangesBatch.idl>
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 8f7677d2fc21..b88120a10e2c 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
-#define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
+#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
+#define __com_sun_star_configuration_backend_MultiLayerStratum_idl__
#include <com/sun/star/configuration/backend/XBackendEntities.idl>
#include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
diff --git a/offapi/com/sun/star/configuration/theDefaultProvider.idl b/offapi/com/sun/star/configuration/theDefaultProvider.idl
index ecb86616a938..39301ca75f90 100644
--- a/offapi/com/sun/star/configuration/theDefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/theDefaultProvider.idl
@@ -27,8 +27,8 @@
* instead of those above.
*/
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#define _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
module com { module sun { module star { module lang {
published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 093f74dc5fdc..143eb3e7394d 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_datatransfer_MimeContentType_idl__
-#define __com_sun_star_datatransfer_MimeContentType_idl__
+#ifndef __com_sun_star_datatransfer_MimeContentTypeFactory_idl__
+#define __com_sun_star_datatransfer_MimeContentTypeFactory_idl__
module com { module sun { module star { module datatransfer {
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 8909b023b01b..b3ce22a5370f 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_datatransfer_XTransferDataInfo_idl__
-#define __com_sun_star_datatransfer_XTransferDataInfo_idl__
+#ifndef __com_sun_star_datatransfer_XTransferDataAccess_idl__
+#define __com_sun_star_datatransfer_XTransferDataAccess_idl__
#include <com/sun/star/datatransfer/DataFlavor.idl>
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/deployment/DependencyException.idl b/offapi/com/sun/star/deployment/DependencyException.idl
index eb4e4690f874..0b907032d7cf 100644
--- a/offapi/com/sun/star/deployment/DependencyException.idl
+++ b/offapi/com/sun/star/deployment/DependencyException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 8b9b51d17baa..786850513d0d 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_DeploymentException_idl
-#define INCLUDED_com_sun_star_deployment_DeploymentException_idl
+#ifndef _com_sun_star_deployment_DeploymentException_idl
+#define _com_sun_star_deployment_DeploymentException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index b709de9441b1..27b6e5816264 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
+#ifndef _com_sun_star_deployment_ExtensionManager_idl
+#define _com_sun_star_deployment_ExtensionManager_idl
#include <com/sun/star/deployment/XExtensionManager.idl>
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index b4143eac9eb2..872c4562db22 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/InstallException.idl b/offapi/com/sun/star/deployment/InstallException.idl
index 9777b7747f3c..506887240811 100644
--- a/offapi/com/sun/star/deployment/InstallException.idl
+++ b/offapi/com/sun/star/deployment/InstallException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 66a34ac03d8a..329874eb2a52 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index a12fd1097476..04a8f49dff6e 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_LicenseException_idl
-#define INCLUDED_com_sun_star_deployment_LicenseException_idl
+#ifndef _com_sun_star_deployment_LicenseException_idl
+#define _com_sun_star_deployment_LicenseException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
index 176ece7f6e70..e4c6f2333851 100644
--- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
+++ b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
-#define INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
+#ifndef _com_sun_star_deployment_PackageRegistryBackend_idl
+#define _com_sun_star_deployment_PackageRegistryBackend_idl
#include <com/sun/star/deployment/XPackageRegistry.idl>
diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl
index 56d7c171a02b..be050b4b5740 100644
--- a/offapi/com/sun/star/deployment/PlatformException.idl
+++ b/offapi/com/sun/star/deployment/PlatformException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_PlatformException_idl
-#define INCLUDED_com_sun_star_deployment_PlatformException_idl
+#ifndef _com_sun_star_deployment_PlatformException_idl
+#define _com_sun_star_deployment_PlatformException_idl
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/VersionException.idl b/offapi/com/sun/star/deployment/VersionException.idl
index 002349b17000..84056ed32ecc 100644
--- a/offapi/com/sun/star/deployment/VersionException.idl
+++ b/offapi/com/sun/star/deployment/VersionException.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index 97c15918cb48..a77f716acc98 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XExtensionManager_idl
-#define INCLUDED_com_sun_star_deployment_XExtensionManager_idl
+#ifndef _com_sun_star_deployment_XExtensionManager_idl
+#define _com_sun_star_deployment_XExtensionManager_idl
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/task/XAbortChannel.idl>
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 58b3f1ff9c1d..ef04b73cfabe 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XPackage_idl
-#define INCLUDED_com_sun_star_deployment_XPackage_idl
+#ifndef _com_sun_star_deployment_XPackage_idl
+#define _com_sun_star_deployment_XPackage_idl
#include <com/sun/star/beans/Optional.idl>
#include <com/sun/star/beans/Ambiguous.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index c8f18649179b..40fd7f7724b7 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XPackageManager_idl
-#define INCLUDED_com_sun_star_deployment_XPackageManager_idl
+#ifndef _com_sun_star_deployment_XPackageManager_idl
+#define _com_sun_star_deployment_XPackageManager_idl
#include <com/sun/star/lang/XComponent.idl>
#include <com/sun/star/task/XAbortChannel.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index 358c1d4769ee..b81aa7043ada 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
+#ifndef _com_sun_star_deployment_XPackageManagerFactory_idl
+#define _com_sun_star_deployment_XPackageManagerFactory_idl
#include <com/sun/star/lang/IllegalArgumentException.idl>
#include <com/sun/star/deployment/XPackageManager.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 710cf570ead3..b9f1f9a781dc 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
-#define INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
+#ifndef _com_sun_star_deployment_XPackageRegistry_idl
+#define _com_sun_star_deployment_XPackageRegistry_idl
#include <com/sun/star/deployment/XPackage.idl>
#include <com/sun/star/deployment/XPackageTypeInfo.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
index 218da4197f4d..ce4e4d8f8dc8 100644
--- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
+++ b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
-#define INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
+#ifndef _com_sun_star_deployment_XPackageTypeInfo_idl
+#define _com_sun_star_deployment_XPackageTypeInfo_idl
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/deployment/ExtensionRemovedException.idl>
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index 6df88db058aa..4257a60cbeb0 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
+#ifndef _com_sun_star_deployment_thePackageManagerFactory_idl
+#define _com_sun_star_deployment_thePackageManagerFactory_idl
#include <com/sun/star/deployment/XPackageManagerFactory.idl>
diff --git a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
index 347f1f4394f9..f1c8f2c842fa 100644
--- a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
+#ifndef _com_sun_star_deployment_ui_LicenseDialog_idl
+#define _com_sun_star_deployment_ui_LicenseDialog_idl
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
#include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index f5da87e91724..cf8fa6c40f17 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
+#ifndef _com_sun_star_deployment_ui_PackageManagerDialog_idl
+#define _com_sun_star_deployment_ui_PackageManagerDialog_idl
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl>
#include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
index 526860a01572..297fcb6428a0 100644
--- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#ifndef _com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#define _com_sun_star_deployment_ui_UpdateRequiredDialog_idl
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
#include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 7a561f55a44d..f2a4d7d2a6b7 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
-#define _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
+#ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTER_IDL__
+#define _COM_SUN_STAR_DOCUMENT_FILTERADAPTER_IDL__
#include <com/sun/star/document/XFilterAdapter.idl>
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index bf20d7547aa1..2bf536836441 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
-#define __com_sun_star_document_AmbigousFilterRequest_idl__
+#ifndef __com_sun_star_document_FilterOptionsRequest_idl__
+#define __com_sun_star_document_FilterOptionsRequest_idl__
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/beans/PropertyValue.idl>
diff --git a/offapi/com/sun/star/document/XCmisDocument.idl b/offapi/com/sun/star/document/XCmisDocument.idl
index fabd69f087a0..d1a94f9f998c 100644
--- a/offapi/com/sun/star/document/XCmisDocument.idl
+++ b/offapi/com/sun/star/document/XCmisDocument.idl
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __com_sun_star_document_XCmisDataSupplier_idl__
-#define __com_sun_star_document_XCmisDataSupplier_idl__
+#ifndef __com_sun_star_document_XCmisDocument_idl__
+#define __com_sun_star_document_XCmisDocument_idl__
#include <com/sun/star/beans/PropertyValues.idl>
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl
index 6213b5a8642d..691138d50314 100644
--- a/offapi/com/sun/star/document/XDocumentRecovery.idl
+++ b/offapi/com/sun/star/document/XDocumentRecovery.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapcom_sun_star_document_XDocumentRecovery_idl__
-#define __offapcom_sun_star_document_XDocumentRecovery_idl__
+#ifndef __com_sun_star_document_XDocumentRecovery_idl__
+#define __com_sun_star_document_XDocumentRecovery_idl__
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/io/IOException.idl>
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index 846e3b786975..226782009d4a 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
-#define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
+#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTER_IDL__
+#define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTER_IDL__
#include <com/sun/star/uno/RuntimeException.idl>
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 4e547ab790c9..0819fe2cc220 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
-#define __com_sun_star_embed_XStorageBasedDocument_idl__
+#ifndef __com_sun_star_document_XStorageBasedDocument_idl__
+#define __com_sun_star_document_XStorageBasedDocument_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/embed/XStorage.idl>
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index e793947eefb3..3cd8467c6baf 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
-#define __org_openoffice_vba_XVbaMethodParameter_idl__
+#ifndef __com_sun_star_document_XVbaMethodParameter_idl__
+#define __com_sun_star_document_XVbaMethodParameter_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 2ca933ee0d48..4a7579408a96 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleDrawDocumentView_idl__
+#define __com_sun_star_drawing_AccessibleDrawDocumentView_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
#include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index b916348f648e..f24e51ff0516 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleOLEShape_idl__
+#define __com_sun_star_drawing_AccessibleOLEShape_idl__
#include <com/sun/star/drawing/AccessibleShape.idl>
#include <com/sun/star/accessibility/XAccessibleAction.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 86a80130194c..6ff48387d7a6 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleSlideView_idl__
+#define __com_sun_star_drawing_AccessibleSlideView_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
#include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index 96dbaab63b74..952a30c56fbc 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleSlideViewObject_idl__
+#define __com_sun_star_drawing_AccessibleSlideViewObject_idl__
#include <com/sun/star/accessibility/XAccessible.idl>
#include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
index 79e317878083..00da71a95249 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
-#define __com_sun_star_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
+#define __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
index afb96a153c09..339a0f0c3dae 100644
--- a/offapi/com/sun/star/drawing/XSlideSorterBase.idl
+++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
@@ -20,24 +20,12 @@
#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
#define __com_sun_star_drawing_XSlideSorterBase_idl__
-#ifndef __com_sun_star_drawing_framework_XView_idl__
#include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
#include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
-#endif
module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index ca9775cbf5ad..38fcb79ed1a5 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
-#define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
+#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
+#define __com_sun_star_drawing_framework_AnchorBindingMode_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/util/XCloneable.idl>
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index b2bf634e86cf..2381db5415a0 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
-#define __com_sun_star_drawing_framework_ConfigurationController_idl__
+#ifndef __com_sun_star_drawing_framework_Configuration_idl__
+#define __com_sun_star_drawing_framework_Configuration_idl__
#include <com/sun/star/drawing/framework/XConfiguration.idl>
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
index 551d1c8a33ab..09b7b0b49eee 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
@@ -19,25 +19,11 @@
#ifndef __com_sun_star_embed_XEncryptionProtectedStorage_idl__
#define __com_sun_star_embed_XEncryptionProtectedStorage_idl__
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
#include <com/sun/star/embed/XEncryptionProtectedSource2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_DigestID_idl__
#include <com/sun/star/xml/crypto/DigestID.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_CipherID_idl__
#include <com/sun/star/xml/crypto/CipherID.idl>
-#endif
module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index dfb147160bfb..24aa1d39c769 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_form_component_checkbox_idl__
-#define __com_sun_star_form_component_checkbox_idl__
+#ifndef __com_sun_star_form_control_checkbox_idl__
+#define __com_sun_star_form_control_checkbox_idl__
#include <com/sun/star/awt/UnoControlCheckBox.idl>
#include <com/sun/star/form/XBoundControl.idl>
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 827dd67a82cc..f8daf141b9de 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
-#define __com_sun_star_form_component_InteractionGridControl_idl__
+#ifndef __com_sun_star_form_control_InteractionGridControl_idl__
+#define __com_sun_star_form_control_InteractionGridControl_idl__
#include <com/sun/star/form/control/GridControl.idl>
#include <com/sun/star/frame/XDispatch.idl>
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index b88e2b4538d4..e66018bdae71 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
-#define __com_sun_star_form_ButtonNavigationHandler_idl__
+#ifndef __com_sun_star_form_inspection_ButtonNavigationHandler_idl__
+#define __com_sun_star_form_inspection_ButtonNavigationHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index ebf163107cdb..6be180019633 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
-#define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
+#ifndef __com_sun_star_form_inspection_DefaultFormComponentInspectorModel_idl__
+#define __com_sun_star_form_inspection_DefaultFormComponentInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 884621520b9c..1f40182c00ca 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_form_EventHandler_idl__
-#define __com_sun_star_form_EventHandler_idl__
+#ifndef __com_sun_star_form_inspection_EventHandler_idl__
+#define __com_sun_star_form_inspection_EventHandler_idl__
#include <com/sun/star/inspection/XPropertyHandler.idl>
diff --git a/offapi/com/sun/star/form/runtime/FormController.idl b/offapi/com/sun/star/form/runtime/FormController.idl
index cf021945f497..1f9234469039 100644
--- a/offapi/com/sun/star/form/runtime/FormController.idl
+++ b/offapi/com/sun/star/form/runtime/FormController.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_form_runtime_FormController_idl__
-#define __offapi_com_sun_star_form_runtime_FormController_idl__
+#ifndef __com_sun_star_form_runtime_FormController_idl__
+#define __com_sun_star_form_runtime_FormController_idl__
#include <com/sun/star/form/runtime/XFormController.idl>
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index d0d26cfe50b8..3926b6012cff 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_form_runtime_XFilterController_idl__
-#define __offapi_com_sun_star_form_runtime_XFilterController_idl__
+#ifndef __com_sun_star_form_runtime_XFilterController_idl__
+#define __com_sun_star_form_runtime_XFilterController_idl__
#include <com/sun/star/awt/XControl.idl>
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 13b1f7b1c2e3..0be5f6699fdc 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_form_runtime_XFormController_idl__
-#define __offapi_com_sun_star_form_runtime_XFormController_idl__
+#ifndef __com_sun_star_form_runtime_XFormController_idl__
+#define __com_sun_star_form_runtime_XFormController_idl__
#include <com/sun/star/awt/XTabController.idl>
#include <com/sun/star/container/XChild.idl>
diff --git a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
index 2ddaa8df81ef..b4e0cded8b6b 100644
--- a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
+++ b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_form_runtime_XFormControllerContext_idl__
-#define __offapi_com_sun_star_form_runtime_XFormControllerContext_idl__
+#ifndef __com_sun_star_form_runtime_XFormControllerContext_idl__
+#define __com_sun_star_form_runtime_XFormControllerContext_idl__
#include <com/sun/star/awt/XControl.idl>
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 39b2460839e2..942c9b698aa5 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_formula_AccessibleFormulaView__
-#define __com_sun_star_formula_AccessibleFormulaView__
+#ifndef __com_sun_star_formula_AccessibleFormulaView_idl__
+#define __com_sun_star_formula_AccessibleFormulaView_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/formula/SymbolDescriptor.idl b/offapi/com/sun/star/formula/SymbolDescriptor.idl
index f4224d87880b..37951f728a85 100644
--- a/offapi/com/sun/star/formula/SymbolDescriptor.idl
+++ b/offapi/com/sun/star/formula/SymbolDescriptor.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_formula_Symbol_idl__
-#define __com_sun_star_formula_Symbol_idl__
+#ifndef __com_sun_star_formula_SymbolDescriptor_idl__
+#define __com_sun_star_formula_SymbolDescriptor_idl__
module com { module sun { module star { module formula {
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index 60fcc5c2a1f7..c96402376731 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_frame_LayoutManager_idl__
-#define __com_sun_star_frame_LayoutManager_idl__
+#ifndef __com_sun_star_frame_XMenuBarAcceptor_idl__
+#define __com_sun_star_frame_XMenuBarAcceptor_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/awt/XMenuBar.idl>
diff --git a/offapi/com/sun/star/frame/status/ItemStatus.idl b/offapi/com/sun/star/frame/status/ItemStatus.idl
index bbf6cfee3300..76704f374b39 100644
--- a/offapi/com/sun/star/frame/status/ItemStatus.idl
+++ b/offapi/com/sun/star/frame/status/ItemStatus.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_frame_status_ItemState_idl__
-#define __com_sun_star_frame_status_ItemState_idl__
+#ifndef __com_sun_star_frame_status_ItemStatus_idl__
+#define __com_sun_star_frame_status_ItemStatus_idl__
module com { module sun { module star { module frame { module status {
diff --git a/offapi/com/sun/star/i18n/OrdinalSuffix.idl b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
index fadac755b9a2..6f629cb31e13 100644
--- a/offapi/com/sun/star/i18n/OrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
-#define INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
+#ifndef __com_sun_star_i18n_OrdinalSuffix_idl__
+#define __com_sun_star_i18n_OrdinalSuffix_idl__
#include <com/sun/star/i18n/XOrdinalSuffix.idl>
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index f043e1519af8..86bd06d138d8 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_i18n_XTextConversionResult_idl__
-#define __com_sun_star_i18n_XTextConversionResult_idl__
+#ifndef __com_sun_star_i18n_TextConversionResult_idl__
+#define __com_sun_star_i18n_TextConversionResult_idl__
#include <com/sun/star/i18n/Boundary.idl>
diff --git a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
index ac194303ddc5..c5db13da75aa 100644
--- a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_i18n_XOrdinalSuffix_idl
-#define INCLUDED_com_sun_star_i18n_XOrdinalSuffix_idl
+#ifndef __com_sun_star_i18n_XOrdinalSuffix_idl__
+#define __com_sun_star_i18n_XOrdinalSuffix_idl__
#include <com/sun/star/lang/Locale.idl>
diff --git a/offapi/com/sun/star/logging/XConsoleHandler.idl b/offapi/com/sun/star/logging/XConsoleHandler.idl
index 28dc5c00d538..af5c1afd6a9e 100644
--- a/offapi/com/sun/star/logging/XConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/XConsoleHandler.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_logging_XConsoleHandler_idl__
-#define __offapi_com_sun_star_logging_XConsoleHandler_idl__
+#ifndef __com_sun_star_logging_XConsoleHandler_idl__
+#define __com_sun_star_logging_XConsoleHandler_idl__
#include <com/sun/star/logging/XLogHandler.idl>
diff --git a/offapi/com/sun/star/mozilla/XCodeProxy.idl b/offapi/com/sun/star/mozilla/XCodeProxy.idl
index 37ecd1de6d5a..dc2552aabb9d 100644
--- a/offapi/com/sun/star/mozilla/XCodeProxy.idl
+++ b/offapi/com/sun/star/mozilla/XCodeProxy.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdbc_XCodeProxy_idl__
-#define __com_sun_star_sdbc_XCodeProxy_idl__
+#ifndef __com_sun_star_mozilla_XCodeProxy_idl__
+#define __com_sun_star_mozilla_XCodeProxy_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/mozilla/MozillaProductType.idl>
diff --git a/offapi/com/sun/star/packages/zip/ZipConstants.idl b/offapi/com/sun/star/packages/zip/ZipConstants.idl
index 57b34d3c720f..553ed4707829 100644
--- a/offapi/com/sun/star/packages/zip/ZipConstants.idl
+++ b/offapi/com/sun/star/packages/zip/ZipConstants.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_package_zip_ZipConstants_idl__
-#define __com_sun_star_package_zip_ZipConstants_idl__
+#ifndef __com_sun_star_packages_zip_ZipConstants_idl__
+#define __com_sun_star_packages_zip_ZipConstants_idl__
diff --git a/offapi/com/sun/star/rendering/ARGBColor.idl b/offapi/com/sun/star/rendering/ARGBColor.idl
index 815eb775fd5d..04839fec7151 100644
--- a/offapi/com/sun/star/rendering/ARGBColor.idl
+++ b/offapi/com/sun/star/rendering/ARGBColor.idl
@@ -19,9 +19,7 @@
#ifndef __com_sun_star_rendering_ARGBColor_idl__
#define __com_sun_star_rendering_ARGBColor_idl__
-#ifndef __com_sun_star_rendering_ColorComponent_idl__
#include <com/sun/star/rendering/ColorComponent.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl
index c6a22e63e4f1..dd3e2f451f17 100644
--- a/offapi/com/sun/star/rendering/BitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl
@@ -20,12 +20,8 @@
#ifndef __com_sun_star_rendering_BitmapCanvas_idl__
#define __com_sun_star_rendering_BitmapCanvas_idl__
-#ifndef __com_sun_star_rendering_XBitmap_idl__
#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
#include <com/sun/star/rendering/XBitmapCanvas.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/Canvas.idl b/offapi/com/sun/star/rendering/Canvas.idl
index 3e747a5b675c..e69ed2f9e1d4 100644
--- a/offapi/com/sun/star/rendering/Canvas.idl
+++ b/offapi/com/sun/star/rendering/Canvas.idl
@@ -20,9 +20,7 @@
#ifndef __com_sun_star_rendering_Canvas_idl__
#define __com_sun_star_rendering_Canvas_idl__
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/CanvasFactory.idl b/offapi/com/sun/star/rendering/CanvasFactory.idl
index 742a517419f8..24fe0c8e8222 100644
--- a/offapi/com/sun/star/rendering/CanvasFactory.idl
+++ b/offapi/com/sun/star/rendering/CanvasFactory.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_rendering_CanvasFactory_idl
-#define INCLUDED_com_sun_star_rendering_CanvasFactory_idl
+#ifndef __com_sun_star_rendering_CanvasFactory_idl__
+#define __com_sun_star_rendering_CanvasFactory_idl__
#include <com/sun/star/lang/XMultiComponentFactory.idl>
diff --git a/offapi/com/sun/star/rendering/Color.idl b/offapi/com/sun/star/rendering/Color.idl
index e9860cd82a8f..f7a88a8715e2 100644
--- a/offapi/com/sun/star/rendering/Color.idl
+++ b/offapi/com/sun/star/rendering/Color.idl
@@ -20,9 +20,7 @@
#ifndef __com_sun_star_rendering_Color_idl__
#define __com_sun_star_rendering_Color_idl__
-#ifndef __com_sun_star_rendering_ColorComponent_idl__
#include <com/sun/star/rendering/ColorComponent.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl
index 229c5011a7f4..ba2bc2a702ce 100644
--- a/offapi/com/sun/star/rendering/RGBColor.idl
+++ b/offapi/com/sun/star/rendering/RGBColor.idl
@@ -20,9 +20,7 @@
#ifndef __com_sun_star_rendering_RGBColor_idl__
#define __com_sun_star_rendering_RGBColor_idl__
-#ifndef __com_sun_star_rendering_ColorComponent_idl__
#include <com/sun/star/rendering/ColorComponent.idl>
-#endif
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/TexturingMode.idl b/offapi/com/sun/star/rendering/TexturingMode.idl
index d656859bc890..fb5c61e7a0e1 100644
--- a/offapi/com/sun/star/rendering/TexturingMode.idl
+++ b/offapi/com/sun/star/rendering/TexturingMode.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_rendering_Texture_idl__
-#define __com_sun_star_rendering_Texture_idl__
+#ifndef __com_sun_star_rendering_TexturingMode_idl__
+#define __com_sun_star_rendering_TexturingMode_idl__
module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 189bb20f2017..ffa985c06f94 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_report_inspection__DefaultComponentInspectorModel_idl__
+#ifndef __com_sun_star_report_inspection_DefaultComponentInspectorModel_idl__
#define __com_sun_star_report_inspection_DefaultComponentInspectorModel_idl__
#include <com/sun/star/inspection/XObjectInspectorModel.idl>
diff --git a/offapi/com/sun/star/resource/StringResource.idl b/offapi/com/sun/star/resource/StringResource.idl
index 1d2e16a01b34..f4c56e38b8e4 100644
--- a/offapi/com/sun/star/resource/StringResource.idl
+++ b/offapi/com/sun/star/resource/StringResource.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_resource_StringResourceManager_idl__
-#define __com_sun_star_resource_StringResourceManager_idl__
+#ifndef __com_sun_star_resource_StringResource_idl__
+#define __com_sun_star_resource_StringResource_idl__
#include <com/sun/star/resource/XStringResourcePersistence.idl>
diff --git a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
index e1d3091531f1..21e9beeafcac 100644
--- a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
+++ b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_document_ModuleSizeExceededRequest_idl__
-#define __com_sun_star_document_ModuleSizeExceededRequest_idl__
+#ifndef __com_sun_star_script_ModuleSizeExceededRequest_idl__
+#define __com_sun_star_script_ModuleSizeExceededRequest_idl__
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
index f2b9bd9e191f..d04fe278135d 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_script_provider_XBrowseNodeFactory_idl__
-#define __com_sun_star_script_provider_XBrowseNodeFactory_idl__
+#ifndef __com_sun_star_script_browse_XBrowseNodeFactory_idl__
+#define __com_sun_star_script_browse_XBrowseNodeFactory_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/script/browse/XBrowseNode.idl>
diff --git a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
index b19ef3a838d8..52f1937bf919 100644
--- a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_InteractionHandler_idl__
-#define __com_sun_star_sdb_InteractionHandler_idl__
+#ifndef __com_sun_star_sdb_DatabaseInteractionHandler_idl__
+#define __com_sun_star_sdb_DatabaseInteractionHandler_idl__
module com { module sun { module star { module task {
interface XInteractionHandler2;
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index 6da2983e110d..f343f99a163e 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_DocumentDefinition_idl__
-#define __com_sun_star_sdb_DocumentDefinition_idl__
+#ifndef __com_sun_star_sdb_Document_idl__
+#define __com_sun_star_sdb_Document_idl__
#include <com/sun/star/beans/XPropertySet.idl>
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index 3a7220070aba..26d226fb0d17 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_DocumentDefinition2_idl__
-#define __com_sun_star_sdb_DocumentDefinition2_idl__
+#ifndef __com_sun_star_sdb_DocumentDefinition_idl__
+#define __com_sun_star_sdb_DocumentDefinition_idl__
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/sdb/DefinitionContent.idl>
diff --git a/offapi/com/sun/star/sdb/application/DefaultViewController.idl b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
index 8b58b0e368ab..289c9b2b08d0 100644
--- a/offapi/com/sun/star/sdb/application/DefaultViewController.idl
+++ b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_application_ApplicationController_idl__
-#define __com_sun_star_sdb_application_ApplicationController_idl__
+#ifndef __com_sun_star_sdb_application_DefaultViewController_idl__
+#define __com_sun_star_sdb_application_DefaultViewController_idl__
#include <com/sun/star/frame/Controller.idl>
#include <com/sun/star/ui/XContextMenuInterception.idl>
diff --git a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
index 0ad43228f11b..2aef3190cfd9 100644
--- a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
+++ b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_ui_XTableUIProvider_idl__
-#define __com_sun_star_sdb_ui_XTableUIProvider_idl__
+#ifndef __com_sun_star_sdb_application_XTableUIProvider_idl__
+#define __com_sun_star_sdb_application_XTableUIProvider_idl__
#include <com/sun/star/graphic/XGraphic.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/sdb/tools/CompositionType.idl b/offapi/com/sun/star/sdb/tools/CompositionType.idl
index 4bb8944df53b..868bfd06406a 100644
--- a/offapi/com/sun/star/sdb/tools/CompositionType.idl
+++ b/offapi/com/sun/star/sdb/tools/CompositionType.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sdb_tools_CompositionRule_idl__
-#define __com_sun_star_sdb_tools_CompositionRule_idl__
+#ifndef __com_sun_star_sdb_tools_CompositionType_idl__
+#define __com_sun_star_sdb_tools_CompositionType_idl__
module com { module sun { module star { module sdb { module tools {
diff --git a/offapi/com/sun/star/sdbcx/XAlterView.idl b/offapi/com/sun/star/sdbcx/XAlterView.idl
index bc1e47d7a946..73dba72fbf80 100644
--- a/offapi/com/sun/star/sdbcx/XAlterView.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterView.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_sdbcx_XAlterView_idl__
-#define __offapi_com_sun_star_sdbcx_XAlterView_idl__
+#ifndef __com_sun_star_sdbcx_XAlterView_idl__
+#define __com_sun_star_sdbcx_XAlterView_idl__
#include <com/sun/star/sdbc/SQLException.idl>
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index 576c3d061007..cf6050627a84 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_security_CertificateContainer_idl
-#define INCLUDED_com_sun_star_security_CertificateContainer_idl
+#ifndef __com_sun_star_security_CertificateContainer_idl__
+#define __com_sun_star_security_CertificateContainer_idl__
#include <com/sun/star/security/XCertificateContainer.idl>
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index a338dd888510..f98529d96499 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_security_XCertificateContainer_idl
-#define INCLUDED_com_sun_star_security_XCertificateContainer_idl
+#ifndef __com_sun_star_security_XCertificateContainer_idl__
+#define __com_sun_star_security_XCertificateContainer_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/security/CertificateContainerStatus.idl>
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index d6dda698cef0..2d817756ccd6 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sheet_DataPilotTableDescriptor_idl__
-#define __com_sun_star_sheet_DataPilotTableDescriptor_idl__
+#ifndef __com_sun_star_sheet_DataPilotDescriptor_idl__
+#define __com_sun_star_sheet_DataPilotDescriptor_idl__
#include <com/sun/star/sheet/XDataPilotDescriptor.idl>
#include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl>
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets2.idl b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
index 498b15cb7b7b..d7b92f7f96e6 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets2.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
@@ -22,8 +22,8 @@
* instead of those above.
*/
-#ifndef __com_sun_star_table_XSpreadsheets2_idl__
-#define __com_sun_star_table_XSpreadsheets2_idl__
+#ifndef __com_sun_star_sheet_XSpreadsheets2_idl__
+#define __com_sun_star_sheet_XSpreadsheets2_idl__
#include <com/sun/star/sheet/XSpreadsheets.idl>
#include <com/sun/star/sheet/XSpreadsheetDocument.idl>
diff --git a/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
index efb024c0c769..6512661a4136 100644
--- a/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
@@ -32,21 +32,10 @@
#ifndef __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
#define __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#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
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
module com { module sun { module star { module sheet {
diff --git a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
index 2f0d304a9600..d3da3bbee5d7 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
-#define __com_sun_star_style_CharacterProperties_Complex_idl__
+#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
+#define __com_sun_star_style_CharacterPropertiesComplex_idl__
#include <com/sun/star/lang/Locale.idl>
#include <com/sun/star/awt/FontSlant.idl>
diff --git a/offapi/com/sun/star/style/XStyleSupplier.idl b/offapi/com/sun/star/style/XStyleSupplier.idl
index fc285d7255f0..1e9e171ae183 100644
--- a/offapi/com/sun/star/style/XStyleSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleSupplier.idl
@@ -19,15 +19,9 @@
#ifndef com_sun_star_style_XStyleSupplier_idl
#define com_sun_star_style_XStyleSupplier_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_style_XStyle_idl__
#include <com/sun/star/style/XStyle.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com
{
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index 63c9a535879f..cafff844d9c4 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sync_XSVGPrinter_idl__
-#define __com_sun_star_sync_XSVGPrinter_idl__
+#ifndef __com_sun_star_svg_XSVGPrinter_idl__
+#define __com_sun_star_svg_XSVGPrinter_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index 58b5301369fc..da0002d20402 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sync_XSVGWriter_idl__
-#define __com_sun_star_sync_XSVGWriter_idl__
+#ifndef __com_sun_star_svg_XSVGWriter_idl__
+#define __com_sun_star_svg_XSVGWriter_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index 1d7d5ade6ce1..7a4251a9bd3c 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
+#ifndef __com_sun_star_table_AccessibleCellView_idl__
+#define __com_sun_star_table_AccessibleCellView_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 06fe6ca88737..f17a145657c6 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
-#define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
+#ifndef __com_sun_star_table_AccessibleTableView_idl__
+#define __com_sun_star_table_AccessibleTableView_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index be3226924663..b60380dd9f2e 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_sheet_CellRangeListSource_idl__
-#define __com_sun_star_sheet_CellRangeListSource_idl__
+#ifndef __com_sun_star_table_CellRangeListSource_idl__
+#define __com_sun_star_table_CellRangeListSource_idl__
#include <com/sun/star/form/binding/ListEntrySource.idl>
#include <com/sun/star/table/CellRangeAddress.idl>
diff --git a/offapi/com/sun/star/table/CellVertJustify2.idl b/offapi/com/sun/star/table/CellVertJustify2.idl
index 31b0d7df36eb..87ce3547550a 100644
--- a/offapi/com/sun/star/table/CellVertJustify2.idl
+++ b/offapi/com/sun/star/table/CellVertJustify2.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_table_CellVertJustify_idl__
-#define __com_sun_star_table_CellVertJustify_idl__
+#ifndef __com_sun_star_table_CellVertJustify2_idl__
+#define __com_sun_star_table_CellVertJustify2_idl__
module com { module sun { module star { module table {
diff --git a/offapi/com/sun/star/task/NoMasterException.idl b/offapi/com/sun/star/task/NoMasterException.idl
index 9020e09759ce..91c7f72503c7 100644
--- a/offapi/com/sun/star/task/NoMasterException.idl
+++ b/offapi/com/sun/star/task/NoMasterException.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_task_MasterPasswordRequest_idl__
-#define __com_sun_star_task_MasterPasswordRequest_idl__
+#ifndef __com_sun_star_task_NoMasterException_idl__
+#define __com_sun_star_task_NoMasterException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
#include <com/sun/star/task/PasswordRequestMode.idl>
diff --git a/offapi/com/sun/star/task/XAbortChannel.idl b/offapi/com/sun/star/task/XAbortChannel.idl
index 921ae63ce59f..8b9bb6012a84 100644
--- a/offapi/com/sun/star/task/XAbortChannel.idl
+++ b/offapi/com/sun/star/task/XAbortChannel.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_task_XAbortChannel_idl
-#define INCLUDED_com_sun_star_task_XAbortChannel_idl
+#ifndef __com_sun_star_task_XAbortChannel_idl__
+#define __com_sun_star_task_XAbortChannel_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index d03e245c1eb0..688a67dd50c8 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
-#define __com_sun_star_text_AccessibleEndnoteView_idl__
+#ifndef __com_sun_star_text_AccessiblePageView_idl__
+#define __com_sun_star_text_AccessiblePageView_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 940f969c6e5b..87cd56d1c497 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
-#define __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
+#ifndef __com_sun_star_text_AccessibleTextEmbeddedObject_idl__
+#define __com_sun_star_text_AccessibleTextEmbeddedObject_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index abd99b0f7840..6d3048c56369 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
-#define __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
+#ifndef __com_sun_star_text_AccessibleTextGraphicObject_idl__
+#define __com_sun_star_text_AccessibleTextGraphicObject_idl__
#include <com/sun/star/accessibility/XAccessibleContext.idl>
#include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 9ba5794d4ca8..281f8181bcb1 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_DocumentIndex_idl__
-#define __com_sun_star_text_DocumentIndex_idl__
+#ifndef __com_sun_star_text_DocumentIndexLevelFormat_idl__
+#define __com_sun_star_text_DocumentIndexLevelFormat_idl__
#include <com/sun/star/container/XIndexReplace.idl>
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index 6984709b021a..e673700025e6 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_DocumentIndex_idl__
-#define __com_sun_star_text_DocumentIndex_idl__
+#ifndef __com_sun_star_text_DocumentIndexParagraphStyles_idl__
+#define __com_sun_star_text_DocumentIndexParagraphStyles_idl__
#include <com/sun/star/container/XIndexReplace.idl>
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index 0ba792962f4f..5bf7ca35eb2c 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_TextDocumentSettings_idl__
-#define __com_sun_star_text_TextDocumentSettings_idl__
+#ifndef __com_sun_star_text_DocumentSettings_idl__
+#define __com_sun_star_text_DocumentSettings_idl__
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/document/Settings.idl>
diff --git a/offapi/com/sun/star/text/GlobalSettings.idl b/offapi/com/sun/star/text/GlobalSettings.idl
index 1bfd1f904ff4..f5613b3a0b20 100644
--- a/offapi/com/sun/star/text/GlobalSettings.idl
+++ b/offapi/com/sun/star/text/GlobalSettings.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_BaseFrame_idl__
-#define __com_sun_star_text_BaseFrame_idl__
+#ifndef __com_sun_star_text_GlobalSettings_idl__
+#define __com_sun_star_text_GlobalSettings_idl__
#include <com/sun/star/view/XPrintSettingsSupplier.idl>
#include <com/sun/star/view/XViewSettingsSupplier.idl>
diff --git a/offapi/com/sun/star/text/NumberingStyle.idl b/offapi/com/sun/star/text/NumberingStyle.idl
index d64abb4c552a..64c70476ad41 100644
--- a/offapi/com/sun/star/text/NumberingStyle.idl
+++ b/offapi/com/sun/star/text/NumberingStyle.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_style_NumberingStyle_idl__
-#define __com_sun_star_style_NumberingStyle_idl__
+#ifndef __com_sun_star_text_NumberingStyle_idl__
+#define __com_sun_star_text_NumberingStyle_idl__
#include <com/sun/star/style/Style.idl>
#include <com/sun/star/text/NumberingRules.idl>
diff --git a/offapi/com/sun/star/text/TableColumns.idl b/offapi/com/sun/star/text/TableColumns.idl
index 5fbba617b798..c3d3b4900ff9 100644
--- a/offapi/com/sun/star/text/TableColumns.idl
+++ b/offapi/com/sun/star/text/TableColumns.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_table_TableColumns_idl__
-#define __com_sun_star_table_TableColumns_idl__
+#ifndef __com_sun_star_text_TableColumns_idl__
+#define __com_sun_star_text_TableColumns_idl__
#include <com/sun/star/table/XTableColumns.idl>
#include <com/sun/star/container/XIndexAccess.idl>
diff --git a/offapi/com/sun/star/text/TableRows.idl b/offapi/com/sun/star/text/TableRows.idl
index e79f9fe076f7..72c4986af0cc 100644
--- a/offapi/com/sun/star/text/TableRows.idl
+++ b/offapi/com/sun/star/text/TableRows.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_table_TableRows_idl__
-#define __com_sun_star_table_TableRows_idl__
+#ifndef __com_sun_star_text_TableRows_idl__
+#define __com_sun_star_text_TableRows_idl__
#include <com/sun/star/table/XTableRows.idl>
#include <com/sun/star/container/XIndexAccess.idl>
diff --git a/offapi/com/sun/star/text/TextSortable.idl b/offapi/com/sun/star/text/TextSortable.idl
index 64e4f5755e82..731faa7c1bd4 100644
--- a/offapi/com/sun/star/text/TextSortable.idl
+++ b/offapi/com/sun/star/text/TextSortable.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_util_TextSortable_idl__
-#define __com_sun_star_util_TextSortable_idl__
+#ifndef __com_sun_star_text_TextSortable_idl__
+#define __com_sun_star_text_TextSortable_idl__
#include <com/sun/star/text/TextSortDescriptor.idl>
#include <com/sun/star/util/XSortable.idl>
diff --git a/offapi/com/sun/star/text/XTextCopy.idl b/offapi/com/sun/star/text/XTextCopy.idl
index 4d2a3f0a4fe3..6530b12b1522 100644
--- a/offapi/com/sun/star/text/XTextCopy.idl
+++ b/offapi/com/sun/star/text/XTextCopy.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_XText_idl__
-#define __com_sun_star_text_XText_idl__
+#ifndef __com_sun_star_text_XTextCopy_idl__
+#define __com_sun_star_text_XTextCopy_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/text/fieldmaster/User.idl b/offapi/com/sun/star/text/fieldmaster/User.idl
index fdf971a07e09..72029e7d9775 100644
--- a/offapi/com/sun/star/text/fieldmaster/User.idl
+++ b/offapi/com/sun/star/text/fieldmaster/User.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_fieldmaster_ConditionalText_idl_
-#define __com_sun_star_text_fieldmaster_ConditionalText_idl_
+#ifndef __com_sun_star_text_fieldmaster_User_idl_
+#define __com_sun_star_text_fieldmaster_User_idl_
#include <com/sun/star/text/TextFieldMaster.idl>
#include <com/sun/star/beans/PropertyValues.idl>
diff --git a/offapi/com/sun/star/text/textfield/DropDown.idl b/offapi/com/sun/star/text/textfield/DropDown.idl
index b35676f239e4..ec93e664f034 100644
--- a/offapi/com/sun/star/text/textfield/DropDown.idl
+++ b/offapi/com/sun/star/text/textfield/DropDown.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_Author_idl__
-#define __com_sun_star_text_textfield_Author_idl_
+#ifndef __com_sun_star_text_textfield_DropDown_idl__
+#define __com_sun_star_text_textfield_DropDown_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
index af5855404280..a44418dfa397 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_ChangeAuthor_idl__
-#define __com_sun_star_text_textfield_ChangeAuthor_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_ChangeAuthor_idl__
+#define __com_sun_star_text_textfield_docinfo_ChangeAuthor_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
index 9beb867c8d17..9d0f2eedf597 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_ChangeDateTime_idl__
-#define __com_sun_star_text_textfield_ChangeDateTime_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_ChangeDateTime_idl__
+#define __com_sun_star_text_textfield_docinfo_ChangeDateTime_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
index c6e05241f48e..8beda78d1a31 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_CreateAuthor_idl__
-#define __com_sun_star_text_textfield_CreateAuthor_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_CreateAuthor_idl__
+#define __com_sun_star_text_textfield_docinfo_CreateAuthor_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
index ae68d1c480ba..438c4d9ba033 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_CreateDateTime_idl__
-#define __com_sun_star_text_textfield_CreateDateTime_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_CreateDateTime_idl__
+#define __com_sun_star_text_textfield_docinfo_CreateDateTime_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
index 02dd577c7349..d73eda30c14c 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_EditTime_idl__
-#define __com_sun_star_text_textfield_EditTime_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_EditTime_idl__
+#define __com_sun_star_text_textfield_docinfo_EditTime_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
index 8e2221b0f0f6..4deb0427ca93 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_PrintAuthor_idl__
-#define __com_sun_star_text_textfield_PrintAuthor_idl_
+#ifndef __com_sun_star_text_textfield_docinfo_PrintAuthor_idl__
+#define __com_sun_star_text_textfield_docinfo_PrintAuthor_idl_
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
index 7362a1671f6c..dfc15eaa5493 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_text_textfield_PrintDateTime_idl__
-#define __com_sun_star_text_textfield_PrintDateTime_idl__
+#ifndef __com_sun_star_text_textfield_docinfo_PrintDateTime_idl__
+#define __com_sun_star_text_textfield_docinfo_PrintDateTime_idl__
#include <com/sun/star/text/TextField.idl>
diff --git a/offapi/com/sun/star/ucb/ExpandContentProvider.idl b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
index efa23e5dc97e..423c0d084b73 100644
--- a/offapi/com/sun/star/ucb/ExpandContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
-#define INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
+#ifndef __com_sun_star_ucb_ExpandContentProvider_idl__
+#define __com_sun_star_ucb_ExpandContentProvider_idl__
#include <com/sun/star/ucb/ContentProvider.idl>
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
index d9555c47287c..46c4cdbea789 100644
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAppException.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
-#define __com_sun_star_ucb_InteractiveIOException_idl__
+#ifndef __com_sun_star_ucb_InteractiveAppException_idl__
+#define __com_sun_star_ucb_InteractiveAppException_idl__
#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
#include <com/sun/star/ucb/IOErrorCode.idl>
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 0c92c3f393bc..ffe2cdadf10a 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
-#define __com_sun_star_ui_ModuleUICommandDescription_idl__
+#ifndef __com_sun_star_ui_ModuleUICategoryDescription_idl__
+#define __com_sun_star_ui_ModuleUICategoryDescription_idl__
#include <com/sun/star/container/XNameAccess.idl>
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index 95e853b9eb86..738f4c7d93da 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
-#define __com_sun_star_ui_ModuleUICommandDescription_idl__
+#ifndef __com_sun_star_ui_ModuleWindowStateConfiguration_idl__
+#define __com_sun_star_ui_ModuleWindowStateConfiguration_idl__
#include <com/sun/star/container/XNameContainer.idl>
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index beda0715c6a3..0fe259347bef 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_frame_XUIElementFactoryRegistration_idl__
-#define __com_sun_star_frame_XUIElementFactoryRegistration_idl__
+#ifndef __com_sun_star_ui_XUIElementFactoryRegistration_idl__
+#define __com_sun_star_ui_XUIElementFactoryRegistration_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/ui/XUIElementFactory.idl>
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index c0be4a093a95..1ee857d3aa31 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_frame_XUIFunctionListener_idl__
-#define __com_sun_star_frame_XUIFunctionListener_idl__
+#ifndef __com_sun_star_ui_XUIFunctionListener_idl__
+#define __com_sun_star_ui_XUIFunctionListener_idl__
#include <com/sun/star/lang/XEventListener.idl>
diff --git a/offapi/com/sun/star/ui/dialogs/ControlActions.idl b/offapi/com/sun/star/ui/dialogs/ControlActions.idl
index dc458afdf685..43130cf59d5d 100644
--- a/offapi/com/sun/star/ui/dialogs/ControlActions.idl
+++ b/offapi/com/sun/star/ui/dialogs/ControlActions.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_ui_dialog_ControlActions_idl__
-#define __com_sun_star_ui_dialog_ControlActions_idl__
+#ifndef __com_sun_star_ui_dialogs_ControlActions_idl__
+#define __com_sun_star_ui_dialogs_ControlActions_idl__
module com { module sun { module star { module ui { module dialogs {
diff --git a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
index 2fc253aa2b22..e15aeb04244a 100644
--- a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
+++ b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_ui_dialog_ListboxControlActions_idl__
-#define __com_sun_star_ui_dialog_ListboxControlActions_idl__
+#ifndef __com_sun_star_ui_dialogs_ListboxControlActions_idl__
+#define __com_sun_star_ui_dialogs_ListboxControlActions_idl__
module com { module sun { module star { module ui { module dialogs {
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index 6ad3c2d3ab8c..b2287e2ab9cc 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun__star_util_JobManager_idl__
-#define __com_sun__star_util_JobManager_idl__
+#ifndef __com_sun_star_util_JobManager_idl__
+#define __com_sun_star_util_JobManager_idl__
#include <com/sun/star/util/XJobManager.idl>
diff --git a/offapi/com/sun/star/util/SearchAlgorithms.idl b/offapi/com/sun/star/util/SearchAlgorithms.idl
index 7403184920a1..3a20533238b6 100644
--- a/offapi/com/sun/star/util/SearchAlgorithms.idl
+++ b/offapi/com/sun/star/util/SearchAlgorithms.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_lang_SearchAlgorithms_idl__
-#define __com_sun_star_lang_SearchAlgorithms_idl__
+#ifndef __com_sun_star_util_SearchAlgorithms_idl__
+#define __com_sun_star_util_SearchAlgorithms_idl__
diff --git a/offapi/com/sun/star/util/SearchFlags.idl b/offapi/com/sun/star/util/SearchFlags.idl
index 1b7be456895c..6a93a19156cb 100644
--- a/offapi/com/sun/star/util/SearchFlags.idl
+++ b/offapi/com/sun/star/util/SearchFlags.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_lang_SearchFlags_idl__
-#define __com_sun_star_lang_SearchFlags_idl__
+#ifndef __com_sun_star_util_SearchFlags_idl__
+#define __com_sun_star_util_SearchFlags_idl__
diff --git a/offapi/com/sun/star/util/SearchOptions.idl b/offapi/com/sun/star/util/SearchOptions.idl
index 9aa579107efc..0b9426565f21 100644
--- a/offapi/com/sun/star/util/SearchOptions.idl
+++ b/offapi/com/sun/star/util/SearchOptions.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_lang_SearchOptions_idl__
-#define __com_sun_star_lang_SearchOptions_idl__
+#ifndef __com_sun_star_util_SearchOptions_idl__
+#define __com_sun_star_util_SearchOptions_idl__
#include <com/sun/star/lang/Locale.idl>
diff --git a/offapi/com/sun/star/util/SearchResult.idl b/offapi/com/sun/star/util/SearchResult.idl
index 822a2886b063..6a81207cea3b 100644
--- a/offapi/com/sun/star/util/SearchResult.idl
+++ b/offapi/com/sun/star/util/SearchResult.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_lang_SearchResult_idl__
-#define __com_sun_star_lang_SearchResult_idl__
+#ifndef __com_sun_star_util_SearchResult_idl__
+#define __com_sun_star_util_SearchResult_idl__
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 9e7c0607e6b8..e96d4b6ec623 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun__star_util_UriAbbreviation_idl__
-#define __com_sun__star_util_UriAbbreviation_idl__
+#ifndef __com_sun_star_util_UriAbbreviation_idl__
+#define __com_sun_star_util_UriAbbreviation_idl__
#include <com/sun/star/util/XStringAbbreviation.idl>
diff --git a/offapi/com/sun/star/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 9be6136de00d..90339abb36e3 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_util_XClosable_idl__
-#define __com_sun_star_util_XClosable_idl__
+#ifndef __com_sun_star_util_XCloseable_idl__
+#define __com_sun_star_util_XCloseable_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/util/XCloseBroadcaster.idl>
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index a03be77d9739..07214f09254f 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_lang_XTextSearch_idl__
-#define __com_sun_star_lang_XTextSearch_idl__
+#ifndef __com_sun_star_util_XTextSearch_idl__
+#define __com_sun_star_util_XTextSearch_idl__
#include <com/sun/star/lang/Locale.idl>
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index 256481736dfe..e0c61f38dd1b 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_container_XUniqueIDFactory_idl__
-#define __com_sun_star_container_XUniqueIDFactory_idl__
+#ifndef __com_sun_star_util_XUniqueIDFactory_idl__
+#define __com_sun_star_util_XUniqueIDFactory_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/view/XFormLayerAccess.idl b/offapi/com/sun/star/view/XFormLayerAccess.idl
index fed4de4087d9..7fd88accaa72 100644
--- a/offapi/com/sun/star/view/XFormLayerAccess.idl
+++ b/offapi/com/sun/star/view/XFormLayerAccess.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __offapi_com_sun_star_view_XFormLayerAccess_idl__
-#define __offapi_com_sun_star_view_XFormLayerAccess_idl__
+#ifndef __com_sun_star_view_XFormLayerAccess_idl__
+#define __com_sun_star_view_XFormLayerAccess_idl__
#include <com/sun/star/view/XControlAccess.idl>
#include <com/sun/star/form/XForm.idl>
diff --git a/offapi/com/sun/star/xforms/XDataTypeRepository.idl b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
index ea7a77597c7d..0ee6ad70d170 100644
--- a/offapi/com/sun/star/xforms/XDataTypeRepository.idl
+++ b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xsd_XDataTypeRepository_idl__
-#define __com_sun_star_xsd_XDataTypeRepository_idl__
+#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
+#define __com_sun_star_xforms_XDataTypeRepository_idl__
#include <com/sun/star/container/XEnumerationAccess.idl>
#include <com/sun/star/container/XNameAccess.idl>
diff --git a/offapi/com/sun/star/xforms/XSubmission.idl b/offapi/com/sun/star/xforms/XSubmission.idl
index 3534cba83709..d51d2c2c40ea 100644
--- a/offapi/com/sun/star/xforms/XSubmission.idl
+++ b/offapi/com/sun/star/xforms/XSubmission.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xsd_XSubmission_idl__
-#define __com_sun_star_xsd_XSubmission_idl__
+#ifndef __com_sun_star_xforms_XSubmission_idl__
+#define __com_sun_star_xforms_XSubmission_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/XPropertySet.idl>
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index f1882974672e..12857b4acdce 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
-#define __com_sun_star_drawing_NamespaceContainer_idl__
+#ifndef __com_sun_star_xml_AttributeContainer_idl__
+#define __com_sun_star_xml_AttributeContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 4103acf49185..00f245337e5d 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
-#define __com_sun_star_drawing_NamespaceContainer_idl__
+#ifndef __com_sun_star_xml_NamespaceContainer_idl__
+#define __com_sun_star_xml_NamespaceContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContext.idl b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
index 961414ef4548..873d3067adc0 100644
--- a/offapi/com/sun/star/xml/crypto/XCipherContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
@@ -19,17 +19,9 @@
#ifndef __com_sun_star_xml_crypto_xciphercontext_idl_
#define __com_sun_star_xml_crypto_xciphercontext_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
-
-#ifndef __com_sun_star_lang_DisposedException_idl__
#include <com/sun/star/lang/DisposedException.idl>
-#endif
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
index 40190c8d48b8..0a13cf87e60d 100644
--- a/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
+++ b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
@@ -19,21 +19,10 @@
#ifndef __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
#define __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_XCipherContext_idl__
#include <com/sun/star/xml/crypto/XCipherContext.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContext.idl b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
index 44d133e962ff..aa869cbe02bb 100644
--- a/offapi/com/sun/star/xml/crypto/XDigestContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
@@ -19,13 +19,8 @@
#ifndef __com_sun_star_xml_crypto_xdigestcontext_idl_
#define __com_sun_star_xml_crypto_xdigestcontext_idl_
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_DisposedException_idl__
#include <com/sun/star/lang/DisposedException.idl>
-#endif
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
index 127159c76e70..30daeac41ea5 100644
--- a/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
+++ b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
@@ -19,21 +19,10 @@
#ifndef __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
#define __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_XDigestContext_idl__
#include <com/sun/star/xml/crypto/XDigestContext.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
index 682d396051cd..019d358340e6 100644
--- a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
@@ -21,8 +21,8 @@
/** -- idl definition -- **/
-#ifndef __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
-#define __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
+#ifndef __com_sun_star_xml_crypto_sax_ElementStackItem_idl_
+#define __com_sun_star_xml_crypto_sax_ElementStackItem_idl_
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
index 7eaff6341a85..96bf98a6010b 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
@@ -21,8 +21,8 @@
/** -- idl definition -- **/
-#ifndef __com_sun_star_xml_crypto_sax_xsignaturecollector_idl_
-#define __com_sun_star_xml_crypto_sax_xsignaturecollector_idl_
+#ifndef __com_sun_star_xml_crypto_sax_XReferenceCollector_idl_
+#define __com_sun_star_xml_crypto_sax_XReferenceCollector_idl_
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
index 802f4028d3cb..1c7660eeab2b 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
@@ -21,8 +21,8 @@
/** -- idl definition -- **/
-#ifndef __com_sun_star_xml_crypto_sax_xbuffercontroller_idl_
-#define __com_sun_star_xml_crypto_sax_xbuffercontroller_idl_
+#ifndef __com_sun_star_xml_crypto_sax_XSecurityController_idl_
+#define __com_sun_star_xml_crypto_sax_XSecurityController_idl_
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4a649f8cca6c..0bed88a5faa6 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_dom_documentbuilder_idl
-#define __com_sun_star_xml_dom_documentbuilder_idl
+#ifndef __com_sun_star_xml_dom_SAXDocumentBuilder_idl
+#define __com_sun_star_xml_dom_SAXDocumentBuilder_idl
#include <com/sun/star/xml/dom/XSAXDocumentBuilder2.idl>
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 22d3acd6d2f9..be4ed99bec35 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_dom_XEntety_idl__
-#define __com_sun_star_xml_dom_XEntety_idl__
+#ifndef __com_sun_star_xml_dom_XEntity_idl__
+#define __com_sun_star_xml_dom_XEntity_idl__
#include <com/sun/star/xml/dom/XNode.idl>
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index 1f866106a8f0..ca4fc27884dc 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
-#define __com_sun_star_xml_dom_XEntetyReference_idl__
+#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
+#define __com_sun_star_xml_dom_XEntityReference_idl__
#include <com/sun/star/xml/dom/XNode.idl>
diff --git a/offapi/com/sun/star/xml/dom/events/XEvent.idl b/offapi/com/sun/star/xml/dom/events/XEvent.idl
index ebadd9b40e6a..7345b3054cf7 100644
--- a/offapi/com/sun/star/xml/dom/events/XEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XEvent.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_dom_events_XEventTarget_idl__
-#define __com_sun_star_xml_dom_events_XEventtarget_idl__
+#ifndef __com_sun_star_xml_dom_events_XEvent_idl__
+#define __com_sun_star_xml_dom_events_XEvent_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/xml/dom/events/XEventTarget.idl>
diff --git a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
index a39c970b1ac0..970d11f99a97 100644
--- a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
-#define INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
+#ifndef __com_sun_star_xml_input_SaxDocumentHandler_idl__
+#define __com_sun_star_xml_input_SaxDocumentHandler_idl__
#include <com/sun/star/xml/input/XRoot.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl
index b5c78cbf0f5c..254699e4605b 100644
--- a/offapi/com/sun/star/xml/input/XAttributes.idl
+++ b/offapi/com/sun/star/xml/input/XAttributes.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED__com_sun_star_xml_input_XAttributes_idl__
-#define INCLUDED__com_sun_star_xml_input_XAttributes_idl__
+#ifndef __com_sun_star_xml_input_XAttributes_idl__
+#define __com_sun_star_xml_input_XAttributes_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl
index f7f1517b2527..f79daa2acecd 100644
--- a/offapi/com/sun/star/xml/input/XElement.idl
+++ b/offapi/com/sun/star/xml/input/XElement.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED__com_sun_star_xml_input_XElement_idl__
-#define INCLUDED__com_sun_star_xml_input_XElement_idl__
+#ifndef __com_sun_star_xml_input_XElement_idl__
+#define __com_sun_star_xml_input_XElement_idl__
#include <com/sun/star/xml/input/XAttributes.idl>
#include <com/sun/star/xml/sax/SAXException.idl>
diff --git a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
index ad15ac4348d6..08b8fb824a8d 100644
--- a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
+++ b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_com_sun_star_sax_input_XUidMapping_idl
-#define INCLUDED_com_sun_star_sax_input_XUidMapping_idl
+#ifndef __com_sun_star_xml_input_XNamespaceMapping_idl__
+#define __com_sun_star_xml_input_XNamespaceMapping_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl
index cbda471531cf..d9be774d15bb 100644
--- a/offapi/com/sun/star/xml/input/XRoot.idl
+++ b/offapi/com/sun/star/xml/input/XRoot.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED__com_sun_star_xml_input_XRoot_idl__
-#define INCLUDED__com_sun_star_xml_input_XRoot_idl__
+#ifndef __com_sun_star_xml_input_XRoot_idl__
+#define __com_sun_star_xml_input_XRoot_idl__
#include <com/sun/star/xml/input/XNamespaceMapping.idl>
#include <com/sun/star/xml/input/XElement.idl>
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index d05a78d69c3d..772c8bfbc0c0 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_sax_XFastToken_idl__
-#define __com_sun_star_xml_sax_XFastToken_idl__
+#ifndef __com_sun_star_xml_sax_FastToken_idl__
+#define __com_sun_star_xml_sax_FastToken_idl__
#include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 56d7c3b51322..86e253061266 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -19,13 +19,16 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
+
#include <com/sun/star/xml/xpath/XXPathAPI.idl>
+
module com { module sun { module star { module xml { module xpath {
service XPathExtension
{
interface XXPathAPI;
};
+
};};};};};
#endif
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index 8971a901e272..f96d07421222 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -19,13 +19,16 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
+
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
+
module com { module sun { module star { module xml { module xpath {
service XPathExtension
{
interface XXPathExtension;
};
+
};};};};};
#endif
diff --git a/offapi/com/sun/star/xml/xpath/XPathObjectType.idl b/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
index e957c488bd7a..2cefe678ecdd 100644
--- a/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
-#define __com_sun_star_xml_XPath_XObjectType_idl__
+#ifndef __com_sun_star_xml_XPath_XPathObjectType_idl__
+#define __com_sun_star_xml_XPath_XPathObjectType_idl__
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl b/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
index 81db4fa75fde..c658cd85832e 100644
--- a/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
+++ b/offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_COM_SUN_STAR_XML_XSLT_XSLT2TRANSFORMER_IDL
-#define INCLUDED_COM_SUN_STAR_XML_XSLT_XSLT2TRANSFORMER_IDL
+#ifndef __COM_SUN_STAR_XML_XSLT_XSLT2TRANSFORMER_IDL__
+#define __COM_SUN_STAR_XML_XSLT_XSLT2TRANSFORMER_IDL__
#include <com/sun/star/xml/xslt/XXSLTTransformer.idl>
diff --git a/offapi/com/sun/star/xml/xslt/XSLTTransformer.idl b/offapi/com/sun/star/xml/xslt/XSLTTransformer.idl
index 82a99539bb70..52ebe1f879f5 100644
--- a/offapi/com/sun/star/xml/xslt/XSLTTransformer.idl
+++ b/offapi/com/sun/star/xml/xslt/XSLTTransformer.idl
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_COM_SUN_STAR_XML_XSLT_XSLTTRANSFORMER_IDL
-#define INCLUDED_COM_SUN_STAR_XML_XSLT_XSLTTRANSFORMER_IDL
+#ifndef __COM_SUN_STAR_XML_XSLT_XSLTTRANSFORMER_IDL__
+#define __COM_SUN_STAR_XML_XSLT_XSLTTRANSFORMER_IDL__
#include <com/sun/star/xml/xslt/XXSLTTransformer.idl>
diff --git a/offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl b/offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl
index 51de1aaca307..7671579f2666 100644
--- a/offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl
+++ b/offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_COM_SUN_STAR_XML_XSLT_XXSLTTRANSFORMER_IDL
-#define INCLUDED_COM_SUN_STAR_XML_XSLT_XXSLTTRANSFORMER_IDL
+#ifndef __COM_SUN_STAR_XML_XSLT_XXSLTTRANSFORMER_IDL__
+#define __COM_SUN_STAR_XML_XSLT_XXSLTTRANSFORMER_IDL__
#include <com/sun/star/io/XActiveDataControl.idl>
#include <com/sun/star/io/XActiveDataSink.idl>