Strip include guards in idl files part 3 (end)

29 files changed, 0 insertions, 97 deletions

diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index 24cf1ba26c60..c88018a0ad18 100755
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XButton_idl__
 #define __ooo_vba_msforms_XButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index 0a89347ea9bc..301d23a7b396 100755
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XCheckBox_idl__
 #define __ooo_vba_msforms_XCheckBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 0c9e1ee83a1d..ef3a0f8a732f 100755
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XColorFormat_idl__
 #define __ooo_vba_msforms_XColorFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index d3285c7d78b0..286383a5d89b 100755
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XComboBox_idl__
 #define __ooo_vba_msforms_XComboBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 3de8db1eb06c..5b59999f2fc1 100755
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -27,16 +27,8 @@
 #ifndef __ooo_vba_msforms_XControl_idl__
 #define __ooo_vba_msforms_XControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {  module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index 11325303d56c..674ea6e8c608 100755
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XControls_idl__
 #define __ooo_vba_msforms_XControls_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 module ooo {  module vba { module msforms {
 
 interface XControl;
diff --git a/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 02cdc39ad21b..b007245f94ef 100755
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_msforms_XFillFormat_idl__
 #define __ooo_vba_msforms_XFillFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
 #include <ooo/vba/msforms/XColorFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XFillFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 9ed6f9d45046..4680da630818 100755
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XGroupBox_idl__
 #define __ooo_vba_msforms_XGroupBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index f37b62ce146e..2c77aace76e5 100755
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XImage_idl__
 #define __ooo_vba_msforms_XImage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 476ac859b7aa..cead2221575c 100755
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XLabel_idl__
 #define __ooo_vba_msforms_XLabel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index 72df94ee5cd7..ee7eba2e96b0 100755
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -27,13 +27,8 @@
 #ifndef __ooo_vba_msforms_XLineFormat_idl__
 #define __ooo_vba_msforms_XLineFormat_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XColorFormat_idl__
 #include <ooo/vba/msforms/XColorFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XLineFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 6058d826b4d0..27b6f86bbfbf 100755
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XListBox_idl__
 #define __ooo_vba_msforms_XListBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index 7d0c8ee76421..d30026e78ffc 100755
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XMultiPage_idl__
 #define __ooo_vba_msforms_XMultiPage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index fb290be32cda..283efca02610 100755
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XPage_idl__
 #define __ooo_vba_msforms_XPage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index 4eb6a2bcf78f..fabc48dd9058 100755
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -28,9 +28,7 @@
 #define __ooo_vba_msforms_XPictureFormat_idl__
 
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XPictureFormat : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index c40b3f6c1f01..4364f083d320 100755
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XProgressBar_idl__
 #define __ooo_vba_msforms_XProgressBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index b2289ce33331..1c54d6d570c2 100755
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XRadioButton_idl__
 #define __ooo_vba_msforms_XRadioButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
index 6ffc4d1be98b..edca3789f534 100755
--- a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -29,9 +29,7 @@
 #ifndef __ooo_vba_msforms_XReturnInteger_idl__
 #define __ooo_vba_msforms_XReturnInteger_idl__
 
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
 //=============================================================================
 
 module msforms
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
index 3f7d7975cf8c..cd214b71b799 100755
--- a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -29,9 +29,7 @@
 #ifndef __ooo_vba_msforms_XReturnInteger_idl__
 #define __ooo_vba_msforms_XReturnInteger_idl__
 
-#ifndef __com_sun_star_script_XDefaultProperty_idl__
 #include <com/sun/star/script/XDefaultProperty.idl>
-#endif
 //=============================================================================
 
 module msforms
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 37f4a8c32868..7d6c5aea3c4b 100755
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XScrollBar_idl__
 #define __ooo_vba_msforms_XScrollBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index b31dab7a1d91..602b3fdf35bb 100755
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -27,21 +27,10 @@
 #ifndef __ooo_vba_msforms_XShape_idl__
 #define __ooo_vba_msforms_XShape_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XLineFormat_idl__
 #include <ooo/vba/msforms/XLineFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XFillFormat_idl__
 #include <ooo/vba/msforms/XFillFormat.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XPictureFormat_idl__
 #include <ooo/vba/msforms/XPictureFormat.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 interface XShapeRange;
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 0e5e2b5a039d..6aa5778f40fe 100755
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -27,17 +27,9 @@
 #ifndef __ooo_vba_msforms_XShapeRange_idl__
 #define __ooo_vba_msforms_XShapeRange_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-
-#ifndef __ooo_vba_msforms_XShape_idl__
 #include <ooo/vba/msforms/XShape.idl>
-#endif
-
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 
 module ooo {  module vba { module msforms {
 
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index d6ecfec13525..63aaa60e73a3 100755
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XShapes_idl__
 #define __ooo_vba_msforms_XShapes_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef  __ooo_vba_XCollection_idl__
 #include <ooo/vba/XCollection.idl>
-#endif
 module ooo {  module vba { module msforms {
 
 interface XShapeRange;
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index 3732b638f1ab..07e0bac846eb 100755
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XSpinButton_idl__
 #define __ooo_vba_msforms_XSpinButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index 9c6b55e5ca6d..e10ad3fb1bae 100755
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XTextBox_idl__
 #define __ooo_vba_msforms_XTextBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index 30a9adbed7f5..04c504ecd788 100755
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XTextBoxShape_idl__
 #define __ooo_vba_msforms_XTextBoxShape_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __ooo_vba_excel_XCharacters_idl
 #include <ooo/vba/excel/XCharacters.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XTextFrame.idl b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
index fe29f35275b2..7042570e1dc5 100755
--- a/oovbaapi/ooo/vba/msforms/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
@@ -27,9 +27,7 @@
 #ifndef __ooo_vba_msforms_XTextFrame_idl__
 #define __ooo_vba_msforms_XTextFrame_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
 
 module ooo {  module vba {  module msforms {
 interface XTextFrame : ooo::vba::XHelperInterface
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index e66eea54babb..e47e106423e8 100755
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XToggleButton_idl__
 #define __ooo_vba_msforms_XToggleButton_idl__
 
-#ifndef __ooo_vba_msforms_XButton_idl__
 #include <ooo/vba/msforms/XButton.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 //=============================================================================
 
 module ooo {  module vba {  module msforms {
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index c06aa2902b53..4d413777e30a 100755
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -27,12 +27,8 @@
 #ifndef __ooo_vba_msforms_XUserForm_idl__
 #define __ooo_vba_msforms_XUserForm_idl__
 
-#ifndef __ooo_vba_XHelperInterface_idl__
 #include <ooo/vba/XHelperInterface.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 module ooo {  module vba { module msforms {
 interface XUserForm
 {