more removed include guards using fixguard.py

36 files changed, 0 insertions, 96 deletions

diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 04d9fbcc58e4..c8421973817b 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -32,9 +32,7 @@
 #include <svtools/stdctrl.hxx>
 #include <vcl/edit.hxx>
 #include <svtools/svxbox.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/group.hxx>
 #include <vcl/dialog.hxx>
 
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index b682c8d0c129..b682c8d0c129 100755..100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index efe7c0763d9d..efe7c0763d9d 100755..100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index cb095a81c31d..cd013ecab7bb 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -61,9 +61,7 @@ public:
 
 #ifdef _OFA_AUTOCDLG_CXX
 #include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svx/simptabl.hxx>
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 78e545e5e51a..7a0f1276013b 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -29,13 +29,9 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
-#ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
-#endif
 #include <svtools/valueset.hxx>
 #include <svx/dlgctrl.hxx>
 
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 5f37371db4aa..65cc0926b190 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -35,21 +35,13 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
 
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <tools/link.hxx>
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index e7f9047af5ca..22851f71342a 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -30,9 +30,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index 1587dd7baaf5..881281575594 100644
--- a/cui/source/inc/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
@@ -5,9 +5,7 @@
 #include <vcl/field.hxx>
 #include <vcl/dialog.hxx>
 
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 
 //========================================================================
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ae7aa832d264..ba7b4487f12a 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -28,18 +28,10 @@
 #define _SVX_DLG_NAME_HXX
 
 
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 #include <vcl/fixed.hxx>
 
 // #i68101#
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 91d6e89e61dd..10d87c0230b5 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -28,15 +28,9 @@
 #ifndef _SVX_GRFPAGE_HXX
 #define _SVX_GRFPAGE_HXX
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <vcl/graph.hxx>
 #include <sfx2/tabdlg.hxx>
 
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 615e2e56bdc3..29710e32aa2a 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -30,9 +30,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <svtools/svtreebx.hxx>
 
 #include "hlmarkwn_def.hxx" //ADD CHINA001
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 502b212c8a91..502b212c8a91 100755..100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index f4646daf376e..c393a7f15287 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -30,9 +30,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <svtools/ivctrl.hxx>
 #include <svl/itempool.hxx>
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 95e30d241467..fed9c3b0e600 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -30,15 +30,9 @@
 // include ---------------------------------------------------------------
 
 
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <svtools/valueset.hxx>
 #include <sfx2/tabdlg.hxx>
 class SdrView;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index f6f75ddee89d..a8c7ab2d22f1 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -28,9 +28,7 @@
 #ifndef _LINKDLG_HXX
 #define _LINKDLG_HXX
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 0359a330c1f0..5371397c67e0 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -35,9 +35,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <svl/macitem.hxx>
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <rtl/ustring.hxx>
 
 #include <hash_map>
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 44e8f15435fc..d6a4239018ba 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -31,9 +31,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 
 #include "radiobtnbox.hxx"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 3aa1c862e250..352a2b6f24c7 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -36,9 +36,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
-#ifndef _SVX_NUMDEF_HXX
 #include <editeng/numdef.hxx>
-#endif
 #include <svtools/ctrlbox.hxx>
 #include <svl/svarray.hxx>
 
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 3e13018398b5..4c5f8fb34c58 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -29,9 +29,7 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 345623c19cff..c04d42a9c5b1 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -32,9 +32,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/group.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/timer.hxx>
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 2ac80aa64094..6a58f26b76d2 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -30,12 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 
 #ifdef _SVX_OPTPATH_CXX
 #include <svtools/headbar.hxx>
@@ -44,9 +40,7 @@ class HeaderBar;
 #endif
 #include "ControlFocusHelper.hxx"
 
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
 #include <svtools/dialogclosedlistener.hxx>
 
 // forward ---------------------------------------------------------------
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 337c9b84da11..337c9b84da11 100755..100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index a1b71e2f751e..73498af9a115 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -28,9 +28,7 @@
 #ifndef _PASTEDLG_HXX
 #define _PASTEDLG_HXX
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include <sot/formats.hxx>
 #include <tools/globname.hxx>
 #include <svtools/transfer.hxx>
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 0a7b92438db4..8d23c55f3d56 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -29,15 +29,9 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index cdb5a2f89eea..fefb95516a97 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -32,9 +32,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index e8ce016d7d6f..e40f55cec385 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -31,13 +31,9 @@
 
 #include <svx/dlgctrl.hxx>
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <sfx2/basedlgs.hxx>
 
 class SdrView;
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 99b292b560a5..99b292b560a5 100755..100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index d333237f55c7..561212288499 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -31,9 +31,7 @@
 
 #include <svx/dlgctrl.hxx>
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
 // #i75273#
 #include <basegfx/range/b2drange.hxx>
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 5b494a0448b3..79b373bfe528 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -31,9 +31,7 @@
 
 #include <layout/layout.hxx>
 #include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton
 #include <vcl/button.hxx>
-#endif
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 
@@ -43,9 +41,7 @@
 #define ZOOMBTN_PAGEWIDTH   ((USHORT)0x0002)
 #define ZOOMBTN_WHOLEPAGE   ((USHORT)0x0004)
 */
-#ifndef _SVX_ZOOM_HXX
 #include "zoom_def.hxx"
-#endif
 // class SvxZoomDialog ---------------------------------------------------
 /*
     {k:\svx\prototyp\dialog\zoom.bmp}
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 7cdd536a901d..466f65372841 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -31,9 +31,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <svtools/inettbc.hxx>
 #include <svtools/urlcontrol.hxx>
 
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index abf0cf45a2dd..58738dfc83a6 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -36,9 +36,7 @@
 // header for ColorLB
 #include <svx/dlgctrl.hxx>
 // header for PushButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for XColorTable
 #include <svx/xtable.hxx>
 
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b18689d60bc9..d7993244bb9b 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -27,9 +27,7 @@
 #ifndef _SVX_OPTCTL_HXX
 #define _SVX_OPTCTL_HXX
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index e2572e901124..35cb24af6a2d 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -27,12 +27,8 @@
 #ifndef _OFA_OPTFLTR_HXX
 #define _OFA_OPTFLTR_HXX
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/simptabl.hxx>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index f75ff7d05c44..f75ff7d05c44 100755..100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 6a1c91d42ae9..fd309063349c 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -29,9 +29,7 @@
 #define _SVX_OPTJSEARCH_HXX_
 
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
 
 class Window;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 14e42935667b..0381fca237d8 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -31,9 +31,7 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <com/sun/star/container/XNameReplace.hpp>
 
 // class SvxPathTabPage --------------------------------------------------