diff options
Diffstat (limited to 'sw/source/ui/inc')
65 files changed, 0 insertions, 360 deletions
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 26b01ae4accb..e24fc91894d0 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.hxx @@ -30,9 +30,7 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwDropDownField; class SwField; diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index dd3e7e2dce9b..ebe8d5ba6d79 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx @@ -29,9 +29,7 @@ #define SW_SPELL_DIALOG_CHILD_WINDOW_HXX #include <svx/SpellDialogChildWindow.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif class SwWrtShell; struct SpellState; diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 6700212aa0c3..209c0379b114 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -29,17 +29,11 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /*-----------------22.02.97 15.06------------------- diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d1e9a3d82907..9d10c53089fd 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -27,9 +27,7 @@ #ifndef _ACTCTRL_HXX #define _ACTCTRL_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 18eb19228fee..7bf5426638e7 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -28,9 +28,7 @@ #define _ASCFLDLG_HXX #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/basedlgs.hxx> #include <svx/txencbox.hxx> diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 535bc04bf9ca..eb89d875c982 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -27,9 +27,7 @@ #ifndef _AUTOEDIT_HXX #define _AUTOEDIT_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif class AutoEdit : public Edit diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index e09ae625534d..51f8fbddbd0c 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -28,12 +28,8 @@ #ifndef _BMPWIN_HXX #define _BMPWIN_HXX -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif -#ifndef _BITMAPEX_HXX #include <vcl/bitmapex.hxx> -#endif #include <vcl/window.hxx> /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 29c3173787a9..56837ebc350e 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -30,9 +30,7 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "swlbox.hxx" // SwComboBox diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 447afd8ca567..96f57a80fa70 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index 210f81907cc5..2c4e9b88b507 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -28,15 +28,9 @@ #define _CHANGEDB_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 85248baeed8b..1919102589ca 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -28,29 +28,17 @@ #define _SWCHARDLG_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwView; class SvxMacroItem; diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index 852a2f705c68..3585239c6da8 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 1cc6ecf33cb9..b4ce882c7bd9 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -29,28 +29,14 @@ #define _COLUMN_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svtools/valueset.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index bce44192ae68..f3ac989fb939 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -27,9 +27,7 @@ #ifndef _CONDEDTI_HXX #define _CONDEDTI_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/transfer.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index bfcd31dcba87..10abe486155f 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -29,9 +29,7 @@ #include <limits.h> // USHRT_MAX #include "swcont.hxx" -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif class SwWrtShell; class SwContentArr; diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index fc1879bc4f2d..f3b68fdef14e 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -28,9 +28,7 @@ #define _SW_CONVERT_HXX #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <sfx2/basedlgs.hxx> #include <textcontrolcombo.hxx> diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index edb8590d5c8f..032d30ed169d 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -29,25 +29,15 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index c0a530de9f3a..966b2b84eaef 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -29,18 +29,10 @@ #define _DBINSDLG_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svmedit.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 2c8e9cdf02c7..a8571d1853da 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -29,9 +29,7 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index f269693975cc..28aa055de00f 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include "docstat.hxx" diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 50140443f726..e895ff95df94 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -30,25 +30,15 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index b7ae315a9beb..14fea973d137 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -27,26 +27,16 @@ #ifndef _ENVLOP_HXX #define _ENVLOP_HXX -#ifndef _SV_MEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include "envimg.hxx" diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index c039fe512599..23f8a21c34d6 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.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 "toxe.hxx" diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 219f6c37a308..73820c0e7dc1 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -28,27 +28,17 @@ #ifndef _FRMPAGE_HXX #define _FRMPAGE_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <sfx2/tabdlg.hxx> #include <svx/swframeposstrings.hxx> #include <swtypes.hxx> #include <bmpwin.hxx> #include <svx/swframeexample.hxx> #include <prcntfld.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif namespace sfx2{class FileDialogHelper;} diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index c96e4177027b..f40aa2cbb5cd 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -28,19 +28,13 @@ #ifndef _GLOSBIB_HXX #define _GLOSBIB_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svtools/svtabbx.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> class SwGlossaryHdl; diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 3c6ce003ca8f..38403dba6883 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -27,32 +27,20 @@ #ifndef _GLOSSARY_HXX #define _GLOSSARY_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index f0c2f13cc6bc..ffc1fef54c76 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -29,13 +29,9 @@ #include <svx/stddlg.hxx> -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwInputField; class SwSetExpField; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 8693572d167f..f3903836f5f6 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -28,16 +28,10 @@ #define SW_INPUTWIN_HXX -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <sfx2/childwin.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif class SwFldMgr; class SwWrtShell; diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index c9c51301a100..03da1ced9009 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -29,13 +29,9 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/fixed.hxx> class SwWrtShell; diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index e48eece78a9f..31eccb11fd7e 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -27,18 +27,10 @@ #ifndef _INSTABLE_HXX #define _INSTABLE_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <sfx2/basedlgs.hxx> #include <actctrl.hxx> #include <textcontrolcombo.hxx> diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 6fecb6c82b30..ae05222df613 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -31,21 +31,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif class SwWrtShell; class SwFldMgr; diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index 62da2e1925ef..514866dd742b 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -33,9 +33,7 @@ #include <vcl/field.hxx> #include <numberingtypelistbox.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class Window; class SfxItemSet; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index e2717ebb17fa..55ca59b8437e 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -28,18 +28,10 @@ #define _MAILCONFIGPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SwTestAccountSettingsDialog; diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index e1f9f355c96a..6ce93cb518ec 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -29,25 +29,15 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 44916f5d3b1d..024afd836c10 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -27,13 +27,9 @@ #ifndef _MERGETBL_HXX #define _MERGETBL_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/stddlg.hxx> diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 7d5dae802e01..a002353cc968 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -31,19 +31,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwTOXMgr; diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index b2b457bdd5d4..70ce3ed21a2a 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -29,9 +29,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <sfx2/childwin.hxx> diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 2233f9609fe4..84fa861a00c6 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -29,25 +29,13 @@ #include <sfx2/tabdlg.hxx> -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> #include <numprevw.hxx> #include "numrule.hxx" diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index f8d748c4473c..23325d094825 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -32,9 +32,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /* --- class SwParagraphNumTabPage ---------------------------------------- diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 18c1175fda72..33c1fe7827d1 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index d05e68588b2d..8243dfb449aa 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -28,25 +28,15 @@ #define _OPTPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svx/fntctrl.hxx> #include <fontcfg.hxx> diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 65f57636c02d..dad42c1f2a83 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -32,26 +32,16 @@ #include <vcl/menu.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swtypes.hxx" //fuer MAXLEVEL #include <numprevw.hxx> diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index 31bb0c68fc22..2540a6b7241a 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -29,17 +29,11 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index b2e97b65fb62..be0e9b8b4295 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -29,12 +29,8 @@ #include <sfx2/tabdlg.hxx> #include <colex.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- Description: TabPage Format/(Styles/)Page/Text grid diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index bc9fa1855287..d963e8c0f2fa 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -28,9 +28,7 @@ #define _POPBOX_HXX -#ifndef _TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif #include <svtools/transfer.hxx> class SwNavigationPI; diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index e506f31de708..fe9ccd98a429 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.hxx @@ -27,9 +27,7 @@ #ifndef _PRCNTFLD_HXX #define _PRCNTFLD_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" class SW_DLLPUBLIC PercentField : public MetricField diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 152c17387072..49cc214b3ea2 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -31,9 +31,7 @@ #include <redline.hxx> #include <tools/datetime.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index e4b497246cd7..bb90e7da0328 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 80c57767fbe2..283050a9454f 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef _SCROLL_HXX #define _SCROLL_HXX -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif class SwScrollbar: public ScrollBar { diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index 1fa693691086..d7f875b06b28 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -27,18 +27,12 @@ #ifndef _SELGLOS_HXX #define _SELGLOS_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwSelGlossaryDlg : public ModalDialog { diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 9d96d6ac3a9d..52646d1fab07 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index c23ee997852d..f98f752e9cf9 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -32,9 +32,7 @@ #include <unotools/options.hxx> #include <vcl/timer.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <svtools/xtextedt.hxx> class ScrollBar; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 09d91cf64195..aa0051ac2d75 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -27,18 +27,10 @@ #ifndef _SRTDLG_HXX #define _SRTDLG_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <svx/stddlg.hxx> #include <svx/langbox.hxx> diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index a761d60a12ed..fa769b50575a 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.hxx @@ -30,16 +30,12 @@ #ifndef _STMENU_HXX #define _STMENU_HXX -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vector> #include <com/sun/star/smarttags/XSmartTagAction.hpp> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <com/sun/star/text/XTextRange.hpp> class SwView; diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 0c31a9ab977f..3e20824b2901 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -29,13 +29,9 @@ #include <svl/svarray.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include "swdllapi.h" class SwBoxEntry; diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index 16f3d56852e6..623046eb83e2 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 8c7160433837..67a4f41e970f 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 037aac07fe16..3429997d468a 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -30,30 +30,18 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include <sfx2/childwin.hxx> #include "toxe.hxx" #include <svtools/stdctrl.hxx> diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 0ae8c7009426..f00e5395b2bb 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -31,9 +31,7 @@ #ifdef _SYNCDLG #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /*------------------------------------------------------------------------ Beschreibung: diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9c35450eb208..d945279b368d 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -28,25 +28,15 @@ #define SW_TAUTOFMT_HXX #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif class SwTableAutoFmt; class AutoFmtPreview; diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index dbf42d86d085..9c59fdd4bf98 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -28,9 +28,7 @@ #ifndef _TEXTCONTROLCOMBO_HXX #define _TEXTCONTROLCOMBO_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <vcl/field.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index 6399e2acba9e..f68d25549dff 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index a228b8bdea77..92c0e0fbdee8 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.hxx @@ -28,9 +28,7 @@ #define SW_WORDCOUNTDIALOG_HXX #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <layout/layout.hxx> #include <layout/layout-pre.hxx> struct SwDocStat; diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 4ca42086d93e..84521d25981b 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -30,9 +30,7 @@ #include <sfx2/tbxctrl.hxx> #include <vcl/toolbox.hxx> #include <svtools/stdctrl.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif class PopupMenu; class SwView; diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 7d435f90cd17..673ca87e02ec 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -30,21 +30,13 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class Window; class SfxItemSet; |