more removed include guards using fixguard.py

22 files changed, 0 insertions, 66 deletions

diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx
index 152843af51ca..2283470e1d84 100644
--- a/extensions/inc/appsettings.hxx
+++ b/extensions/inc/appsettings.hxx
@@ -27,9 +27,7 @@
 #ifndef _APPSETTINGS_HXX
 #define _APPSETTINGS_HXX
 
-#ifndef __STARDIV_UNO_UTIL_CONTAINR_HXX__
 #include <stardiv/uno/util/containr.hxx>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 7dcba3d588c1..2d1ec7177812 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -30,9 +30,7 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef EXTENSIONS_ABPRESID_HRC
 #include "abpresid.hrc"
-#endif
 #include "componentmodule.hxx"
 #include <vcl/fixed.hxx>
 
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 213ef9755ed8..99b4c1b8cc49 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -34,9 +34,7 @@
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <svtools/stdctrl.hxx>
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <vcl/group.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 13920c5978f7..8c19b1caf00b 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -35,15 +35,11 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include "dbptypes.hxx"
-#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
 #include "dbpresid.hrc"
-#endif
 #include "componentmodule.hxx"
 #include "wizardcontext.hxx"
 
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index bbce935aa98e..a85c43103f62 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -29,9 +29,7 @@
 #define _SERVPROV_HXX
 
 #include <com/sun/star/lang/XInitialization.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
 
 #include "ole2uno.hxx"
 #include "unoconversionutilities.hxx"
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index d6e8b9f276c6..c76709b35bee 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <svtools/wizdlg.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 7848b387d608..0170797e37df 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 /** === end UNO includes === **/
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement
 {
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index edd9d9bd40eb..0b5467ab4bf8 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -29,9 +29,7 @@
 #define _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_
 
 #include "browserline.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
 #include "modulepcr.hxx"
-#endif
 #include "pcrcommon.hxx"
 
 /** === begin UNO includes === **/
@@ -40,9 +38,7 @@
 /** === end UNO includes === **/
 #include <vcl/scrbar.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <tools/link.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 9605ee622234..1ef3b3efaa26 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -30,9 +30,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 /** === begin UNO includes === **/
 #include <com/sun/star/form/XForm.hpp>
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 294a43e4a9e7..2bd80dd7f542 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -29,9 +29,7 @@
 #define _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_
 
 #include "propertyinfo.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
 #include "modulepcr.hxx"
-#endif
 #include "enumrepresentation.hxx"
 #include <comphelper/composedprops.hxx>
 
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index c741f1e08945..71cf8a2d76f4 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -30,9 +30,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 
 /** === begin UNO includes === **/
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 501354c3fcf2..c06add6eb48a 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -33,9 +33,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/edit.hxx>
 
 #include <set>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 4cc77e88c78e..689b78de7f35 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -34,9 +34,7 @@
 #include "proplinelistener.hxx"
 #include "propcontrolobserver.hxx"
 #include "browserview.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_
 #include "modulepcr.hxx"
-#endif
 #include "propertyinfo.hxx"
 #include "pcrcomponentcontext.hxx"
 
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 073debdccda5..3b0a015d9c9a 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -30,9 +30,7 @@
 
 #include "pcrcomponentcontext.hxx"
 #include "pcrcommon.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_
 #include "modulepcr.hxx"
-#endif
 
 /** === begin UNO includes === **/
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 27294a0f9977..345169c6231a 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -30,15 +30,11 @@
 
 #include <vcl/fixed.hxx>
 #include <svtools/svtreebx.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
 #include "modulepcr.hxx"
-#endif
 
 //............................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 392df3f682eb..719eaeba1c88 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -33,22 +33,14 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <comphelper/uno3.hxx>
 
 //............................................................................
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 42791f355493..b583f745a00f 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -28,9 +28,7 @@
 #define _EXTENSIONS_SCANNER_GRID_HXX
 
 #include <vcl/window.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 #include <vcl/dialog.hxx>
 
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 2ea35ca33c83..303241e90bc9 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -30,9 +30,7 @@
 #include <vcl/dialog.hxx>
 #include <tools/config.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
 #include <vcl/field.hxx>
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 3453598974a7..34d0f3e1a82d 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -30,21 +30,15 @@
 
 #include <tools/stream.hxx>
 #include <vos/mutex.hxx>
-#ifndef __RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
-#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP
 #include <com/sun/star/awt/XBitmap.hpp>
-#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#ifndef __COM_SUN_STAR_LANG_EVENTOBJECT_HPP
 #include <com/sun/star/lang/EventObject.hpp>
-#endif
 #include <com/sun/star/scanner/XScannerManager.hpp>
 #include <com/sun/star/scanner/ScannerException.hpp>
 
diff --git a/extensions/source/svg/svgcom.hxx b/extensions/source/svg/svgcom.hxx
index 3e593ff3ccf6..5e5f89a8327e 100644
--- a/extensions/source/svg/svgcom.hxx
+++ b/extensions/source/svg/svgcom.hxx
@@ -29,23 +29,15 @@
 #define _SVGCOM_HXX
 
 #include <cppuhelper/weak.hxx>
-#ifndef __RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stack.hxx>
-#ifndef _SALBTYPE_HXX
 #include <vcl/salbtype.hxx>
-#endif
-#ifndef _GDIMTF_HXX
 #include <vcl/gdimtf.hxx>
-#endif
-#ifndef _METAACT_HXX
 #include <vcl/metaact.hxx>
-#endif
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index bd525853dda1..3121d366a84c 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -31,9 +31,7 @@
 #include "boost/utility.hpp"
 #include <osl/mutex.hxx>
 #include "com/sun/star/uno/Any.h"
-#ifndef  _COM_SUN_STAR_UNO_REFERENCE_HPP_
 #include "com/sun/star/uno/Reference.h"
-#endif
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/awt/Rectangle.hpp"
 #include "com/sun/star/awt/XActionListener.hpp"
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index d5131b4556bf..ed0ec68228f3 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -29,9 +29,7 @@
 #define _XMXCOM_HXX
 
 #include <cppuhelper/weak.hxx>
-#ifndef __RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>