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
2012-12-21 09:12:07 +02:00
parent e93a001887
commit 2a1b850b78
230 changed files with 434 additions and 521 deletions
@@ -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>

@@ -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 {
@@ -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>

@@ -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>

@@ -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>
@@ -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>

@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>

@@ -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>

@@ -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>

@@ -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>
@@ -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>

@@ -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>
@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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 {
@@ -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>
@@ -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>

@@ -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>
@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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
 {
@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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;
@@ -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 {
@@ -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>
@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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__



@@ -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 {

@@ -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>
@@ -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>

@@ -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 {
@@ -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>
@@ -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>
@@ -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>

@@ -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>
--- a/Show More
+++ b/Show More