From a4bf209e2c5c2ff3fed5dcaeb7226b2f549c7ce5 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 5 Oct 2010 15:53:41 +0200 Subject: [PATCH] more removed include guards using fixguard.py --- .../controller/accessibility/AccStatisticsObject.hxx | 2 -- .../controller/dialogs/ChartTypeDialogController.hxx | 2 -- .../source/controller/dialogs/res_LegendPosition.hxx | 2 -- .../controller/dialogs/tp_3D_SceneAppearance.hxx | 2 -- .../controller/dialogs/tp_3D_SceneGeometry.hxx | 2 -- .../controller/dialogs/tp_3D_SceneIllumination.hxx | 2 -- chart2/source/controller/dialogs/tp_DataSource.hxx | 2 -- chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2 -- .../source/controller/inc/ErrorBarItemConverter.hxx | 0 chart2/source/controller/inc/RangeEdit.hxx | 0 .../source/controller/inc/RangeSelectionButton.hxx | 2 -- .../source/controller/inc/RangeSelectionHelper.hxx | 0 chart2/source/controller/inc/dlg_ChartType.hxx | 2 -- chart2/source/controller/inc/dlg_DataSource.hxx | 2 -- chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 2 -- chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 2 -- chart2/source/controller/inc/dlg_InsertLegend.hxx | 2 -- chart2/source/controller/inc/dlg_InsertTitle.hxx | 2 -- chart2/source/controller/inc/dlg_View3D.hxx | 2 -- .../controller/itemsetwrapper/SchWhichPairs.hxx | 2 -- chart2/source/inc/InternalData.hxx | 0 chart2/source/inc/LabeledDataSequence.hxx | 2 -- chart2/source/inc/LifeTime.hxx | 2 -- chart2/source/view/inc/LegendEntryProvider.hxx | 2 -- sc/inc/addincol.hxx | 2 -- sc/inc/compiler.hxx | 2 -- sc/inc/dpglobal.hxx | 0 sc/inc/dptablecache.hxx | 2 -- sc/inc/drawpage.hxx | 2 -- sc/inc/eventuno.hxx | 0 sc/inc/scitems.hxx | 2 -- sc/inc/viewopti.hxx | 2 -- sc/source/core/data/scdpoutputimpl.hxx | 0 sc/source/filter/inc/xlchart.hxx | 0 sc/source/filter/xml/XMLCodeNameProvider.hxx | 0 sc/source/ui/inc/AccessibleContextBase.hxx | 2 -- sc/source/ui/inc/AccessibleDocumentBase.hxx | 2 -- sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 2 -- sc/source/ui/inc/acredlin.hxx | 8 -------- sc/source/ui/inc/anyrefdg.hxx | 6 ------ sc/source/ui/inc/areasdlg.hxx | 4 ---- sc/source/ui/inc/asciiopt.hxx | 12 ------------ sc/source/ui/inc/autofmt.hxx | 12 ------------ sc/source/ui/inc/client.hxx | 2 -- sc/source/ui/inc/consdlg.hxx | 8 -------- sc/source/ui/inc/corodlg.hxx | 6 ------ sc/source/ui/inc/dapidata.hxx | 2 -- sc/source/ui/inc/dapitype.hxx | 2 -- sc/source/ui/inc/dbnamdlg.hxx | 6 ------ sc/source/ui/inc/dpgroupdlg.hxx | 6 ------ sc/source/ui/inc/dwfunctr.hxx | 6 ------ sc/source/ui/inc/fieldwnd.hxx | 0 sc/source/ui/inc/filldlg.hxx | 8 -------- sc/source/ui/inc/filtdlg.hxx | 6 ------ sc/source/ui/inc/foptmgr.hxx | 8 -------- sc/source/ui/inc/formula.hxx | 2 -- sc/source/ui/inc/funcpage.hxx | 2 -- sc/source/ui/inc/funcutl.hxx | 4 ---- sc/source/ui/inc/hdrcont.hxx | 2 -- sc/source/ui/inc/highred.hxx | 10 ---------- sc/source/ui/inc/instbdlg.hxx | 12 ------------ sc/source/ui/inc/lbseldlg.hxx | 2 -- sc/source/ui/inc/linkarea.hxx | 2 -- sc/source/ui/inc/namedlg.hxx | 6 ------ sc/source/ui/inc/notemark.hxx | 2 -- sc/source/ui/inc/opredlin.hxx | 10 ---------- sc/source/ui/inc/optload.hxx | 2 -- sc/source/ui/inc/parawin.hxx | 2 -- sc/source/ui/inc/pfiltdlg.hxx | 12 ------------ sc/source/ui/inc/popmenu.hxx | 2 -- sc/source/ui/inc/printfun.hxx | 2 -- sc/source/ui/inc/pvfundlg.hxx | 10 ---------- sc/source/ui/inc/pvlaydlg.hxx | 6 ------ sc/source/ui/inc/select.hxx | 2 -- sc/source/ui/inc/shtabdlg.hxx | 6 ------ sc/source/ui/inc/simpref.hxx | 8 -------- sc/source/ui/inc/solveroptions.hxx | 2 -- sc/source/ui/inc/tabpages.hxx | 2 -- sc/source/ui/inc/tbzoomsliderctrl.hxx | 10 ---------- sc/source/ui/inc/tphfedit.hxx | 2 -- sc/source/ui/vba/vbaeventshelper.hxx | 0 sc/source/ui/vba/vbahyperlinks.hxx | 0 sc/source/ui/vba/vbasheetobject.hxx | 0 sc/source/ui/vba/vbasheetobjects.hxx | 0 84 files changed, 282 deletions(-) mode change 100755 => 100644 chart2/source/controller/inc/ErrorBarItemConverter.hxx mode change 100755 => 100644 chart2/source/controller/inc/RangeEdit.hxx mode change 100755 => 100644 chart2/source/controller/inc/RangeSelectionHelper.hxx mode change 100755 => 100644 chart2/source/inc/InternalData.hxx mode change 100755 => 100644 sc/inc/dpglobal.hxx mode change 100755 => 100644 sc/inc/eventuno.hxx mode change 100755 => 100644 sc/source/core/data/scdpoutputimpl.hxx mode change 100755 => 100644 sc/source/filter/inc/xlchart.hxx mode change 100755 => 100644 sc/source/filter/xml/XMLCodeNameProvider.hxx mode change 100755 => 100644 sc/source/ui/inc/fieldwnd.hxx mode change 100755 => 100644 sc/source/ui/vba/vbaeventshelper.hxx mode change 100755 => 100644 sc/source/ui/vba/vbahyperlinks.hxx mode change 100755 => 100644 sc/source/ui/vba/vbasheetobject.hxx mode change 100755 => 100644 sc/source/ui/vba/vbasheetobjects.hxx diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index da09342cd8b0..931f95708ffc 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -27,9 +27,7 @@ #ifndef _CHART2_ACCSTATISTICSOBJECT_HXX #define _CHART2_ACCSTATISTICSOBJECT_HXX -#ifndef _CHART2_ACCESSIBLE_CHART_ELEMENT_HXX_ #include "AccessibleChartElement.hxx" -#endif #include "ObjectIdentifier.hxx" diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 56ffb93e4a60..94bfe7dddb71 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -37,9 +37,7 @@ #include #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif // header for class FixedText #include // header for class MetricField diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index ee0ac5a7601c..55aee57d21f2 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -28,9 +28,7 @@ #define _CHART2_RES_LEGENPOSITION_HXX // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif #include // header for class SfxItemSet #include diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 252c5c21669b..3d1e93ae983f 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -34,9 +34,7 @@ // header for class MetricField #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif // header for class ListBox #include #include diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 95aeb7f6a02a..64a4b1b86aab 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -37,9 +37,7 @@ // header for class MetricField #include // header for class OKButton -#ifndef _SV_BUTTON_HXX #include -#endif #include "ControllerLockGuard.hxx" diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 33988a83c921..cd9c3ccaf518 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -37,9 +37,7 @@ // header for class FixedText #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif // header for class ColorLB #include // header for class SvxLightCtl3D diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index e65b503bfcc2..b8e269c02571 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -37,9 +37,7 @@ // header for class ListBox #include // header for class PushButton, OKButton, CancelButton, HelpButton -#ifndef _SV_BUTTON_HXX #include -#endif // header for class FixedText, FixedLine #include // header for class SvTabListBox diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 63caf2885910..959369dc8e08 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -32,9 +32,7 @@ // header for FixedText #include // header for CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif // header for MetricField #include diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx old mode 100755 new mode 100644 diff --git a/chart2/source/controller/inc/RangeEdit.hxx b/chart2/source/controller/inc/RangeEdit.hxx old mode 100755 new mode 100644 diff --git a/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx index 4aedf9012489..5b6ffb7692cd 100644 --- a/chart2/source/controller/inc/RangeSelectionButton.hxx +++ b/chart2/source/controller/inc/RangeSelectionButton.hxx @@ -29,9 +29,7 @@ #define _CHART2_RANGESELECTIONBUTTON_HXX // header for Class ImageButton -#ifndef _SV_BUTTON_HXX #include -#endif //............................................................................. namespace chart diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx old mode 100755 new mode 100644 diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 4144531ed77e..c3a305aaf19c 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -32,9 +32,7 @@ // header for class FixedLine #include // header for class OKButton -#ifndef _SV_BUTTON_HXX #include -#endif #include #include diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index f94c95b33370..358a7d0462f6 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -32,9 +32,7 @@ // header for class TabControl #include // header for class OKButton -#ifndef _SV_BUTTON_HXX #include -#endif #include "TabPageNotifiable.hxx" #include diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 5ed06d365fa2..e10c05b9d66d 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -32,9 +32,7 @@ // header for class FixedLine #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif #include //............................................................................. diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index a22333b5bdc8..1e36a1dd66b3 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -30,9 +30,7 @@ // header for class ModalDialog #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif // header for class SfxItemSet #include //for auto_ptr diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index 8ab7f285b5a9..5a4f2025b260 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -30,9 +30,7 @@ // header for class ModalDialog #include // header for class CheckBox -#ifndef _SV_BUTTON_HXX #include -#endif //for auto_ptr #include #include diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 41eeac7a1055..8a9ca2c8779a 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -29,9 +29,7 @@ #include "TitleDialogData.hxx" #include -#ifndef _SV_BUTTON_HXX #include -#endif //for auto_ptr #include diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 91b16d3512d8..03ffe20d670e 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -35,9 +35,7 @@ // header for class TabControl #include // header for class OKButton -#ifndef _SV_BUTTON_HXX #include -#endif // header for class XColorTable #include diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index f7ddeb42c11e..c5743bd9f3a0 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -27,9 +27,7 @@ #ifndef CHART_SCHWHICHPAIRS_HXX #define CHART_SCHWHICHPAIRS_HXX -#ifndef _SVX_SVXIDS_HRC #include -#endif #include #include #include diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx old mode 100755 new mode 100644 diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index a5ec1d99307d..a0f5ce509f81 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -31,9 +31,7 @@ #include #include -#ifndef _COM_SUN_STAR_CHART2_XLABELEDDATASEQUENCE_HPP_ #include -#endif #include #include #include diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 8e278168259f..e05101ee9f6e 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -29,9 +29,7 @@ #include #include -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HDL_ #include -#endif #include #include #include diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 14b6cda47870..fc4ca0e19b48 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -29,9 +29,7 @@ #include -#ifndef _COM_SUN_STAR_CHART2_VIEWLEGENDENTRYP_HPP_ #include -#endif #include namespace chart diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index fbc1444cc6de..f66a498e8292 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -41,9 +41,7 @@ #include #include "scdllapi.h" -#ifndef SC_SCMATRIX_HXX #include "scmatrix.hxx" -#endif #include diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 2de9f9d68fd3..d2fa4dddfcf6 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -47,9 +47,7 @@ #include -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include -#endif #ifndef INCLUDED_HASH_MAP #include diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx old mode 100755 new mode 100644 diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx index 953c793093be..55fee3c4f6f9 100644 --- a/sc/inc/dptablecache.hxx +++ b/sc/inc/dptablecache.hxx @@ -32,9 +32,7 @@ #define DPTABLECACHE_HXX // Wang Xu Ming -- 12/21/2008 // Add Data Cache Support. -#ifndef SC_SCGLOB_HXX #include "global.hxx" -#endif //Added by PengYunQuan for SODC_16015 #include //end diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 9c39fc71e5af..14691c6632cd 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -28,9 +28,7 @@ #ifndef SC_DRAWPAGE_HXX #define SC_DRAWPAGE_HXX -#ifndef _FM_FMPAGE_HXX #include -#endif class ScDrawLayer; diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx old mode 100755 new mode 100644 diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 8a6589781655..18c96dfe7df3 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -28,9 +28,7 @@ #ifndef SC_ITEMS_HXX #define SC_ITEMS_HXX -#ifndef _SVX_SVXIDS_HRC #include -#endif // EditEngine darf nicht ihre eigenen ITEMID's definieren #define _EEITEMID_HXX diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 47e4047c95d4..985fdb803f2e 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -30,9 +30,7 @@ #include -#ifndef _SVX_SVXIDS_HRC //autogen #include -#endif #include "scdllapi.h" #include "optutil.hxx" #include "global.hxx" diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx old mode 100755 new mode 100644 diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx old mode 100755 new mode 100644 diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx old mode 100755 new mode 100644 diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index ecfeff96af39..0085d01435a8 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -33,9 +33,7 @@ #include #include #include -#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_ #include -#endif #include #include #include diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index fc76a8d771cf..1220fe3bd54d 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -29,9 +29,7 @@ #ifndef _SC_ACCESSIBLEDOCUMENTBASE_HXX #define _SC_ACCESSIBLEDOCUMENTBASE_HXX -#ifndef _SC_ACCESSIBLE_CONTEXT_BASE_HXX #include "AccessibleContextBase.hxx" -#endif class ScAccessibleDocumentBase : public ScAccessibleContextBase diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index dbf7c126b617..7c2345b5fa2c 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -29,9 +29,7 @@ #ifndef _SC_ACCESSIBLEPAGEHEADERAREA_HXX #define _SC_ACCESSIBLEPAGEHEADERAREA_HXX -#ifndef _SC_ACCESSIBLE_CONTEXT_BASE_HXX #include "AccessibleContextBase.hxx" -#endif #include class EditTextObject; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 746122692aa7..4fde0c20a70d 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -28,15 +28,9 @@ #ifndef SC_ACREDLIN_HXX #define SC_ACREDLIN_HXX -#ifndef _MOREBTN_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _GROUP_HXX //autogen #include -#endif #include #include @@ -45,9 +39,7 @@ #include "anyrefdg.hxx" #include -#ifndef _SVX_ACREDLIN_HXX #include -#endif #include #ifndef _SVARRAY_HXX diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 0e7560fe0c50..656ea3fc5cad 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -28,15 +28,9 @@ #ifndef SC_ANYREFDG_HXX #define SC_ANYREFDG_HXX -#ifndef _IMAGEBTN_HXX #include -#endif -#ifndef _EDIT_HXX #include -#endif -#ifndef _ACCEL_HXX #include -#endif #include #include "address.hxx" #include "cell.hxx" diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 08c6e3cf0a91..0628281a377a 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,12 +30,8 @@ #include "address.hxx" -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include class ScDocument; diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 536c5b3a49b3..9d798083a155 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -31,24 +31,12 @@ #define SC_ASCIIOPT_HXX #include -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _FIELD_HXX //autogen #include -#endif #include #include #include "csvtablebox.hxx" diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 27476f413bb2..8fdea5310e6f 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -28,24 +28,12 @@ #ifndef SC_AUTOFMT_HXX #define SC_AUTOFMT_HXX -#ifndef _VIRDEV_HXX //autogen #include -#endif -#ifndef SV_FIXED_HXX #include -#endif -#ifndef SV_LSTBOX_HXX #include -#endif -#ifndef SV_BUTTON_HXX #include -#endif -#ifndef SV_MOREBTN_HXX #include -#endif -#ifndef _DIALOG_HXX //autogen #include -#endif #include #include #include "scdllapi.h" diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 1b13ee224d77..b063ad63c9ba 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -28,9 +28,7 @@ #ifndef SC_CLIENT_HXX #define SC_CLIENT_HXX -#ifndef _SFX_CLIENTSH_HXX //autogen #include -#endif class ScDocument; class ScTabViewShell; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index e82e2619cce0..2004d907137d 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -28,18 +28,10 @@ #ifndef SC_CONSDLG_HXX #define SC_CONSDLG_HXX -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _GROUP_HXX //autogen #include -#endif -#ifndef _MOREBTN_HXX //autogen #include -#endif #include "global.hxx" #include "anyrefdg.hxx" diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index 424326565619..0465ae7fbb04 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -28,15 +28,9 @@ #ifndef SC_CORODLG_HXX #define SC_CORODLG_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include "sc.hrc" #include "scresid.hxx" diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 13d7e91bdceb..5c57493208b3 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -28,9 +28,7 @@ #ifndef SC_DAPIDATA_HXX #define SC_DAPIDATA_HXX -#ifndef _SV_BUTTON_HXX #include -#endif #include #include #include diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 07659b1dbc59..b2a81fa87086 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -28,9 +28,7 @@ #ifndef SC_DAPITYPE_HXX #define SC_DAPITYPE_HXX -#ifndef _SV_BUTTON_HXX #include -#endif #include #include #include diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index cd878c651d6c..65f1b45873b0 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -28,17 +28,11 @@ #ifndef SC_DBNAMDLG_HXX #define SC_DBNAMDLG_HXX -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _MOREBTN_HXX //autogen #include -#endif #include "anyrefdg.hxx" #include "dbcolect.hxx" #include "expftext.hxx" diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 52f2e7c8f592..bf3308958c04 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -28,15 +28,9 @@ #ifndef SC_DPGROUPDLG_HXX #define SC_DPGROUPDLG_HXX -#ifndef _FIXED_HXX #include -#endif -#ifndef _DIALOG_HXX #include -#endif -#ifndef _BUTTON_HXX #include -#endif #include #include #include "editfield.hxx" diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 800696970fbd..584daa904c1e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -32,17 +32,11 @@ #include #include -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _IMAGEBTN_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif #include "anyrefdg.hxx" #include "global.hxx" // ScAddress #include "privsplt.hxx" diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx old mode 100755 new mode 100644 diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 4fe190a06aa7..26dab9f928d9 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -28,18 +28,10 @@ #ifndef SC_FILLDLG_HXX #define SC_FILLDLG_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _EDIT_HXX //autogen #include -#endif #include "global.hxx" class ScDocument; diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 31e0e3a5d4b1..095ebc1345c8 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -28,15 +28,9 @@ #ifndef SC_FILTDLG_HXX #define SC_FILTDLG_HXX -#ifndef _MOREBTN_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif #include #include "global.hxx" // -> ScQueryParam #include "address.hxx" diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 92e3833dff7d..26ce85f8876d 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -28,18 +28,10 @@ #ifndef SC_FOPTMGR_HXX #define SC_FOPTMGR_HXX -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _EDIT_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif //---------------------------------------------------------------------------- diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index f863662f7cd0..65d9cd475fb7 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -31,9 +31,7 @@ #include "anyrefdg.hxx" #include "global.hxx" // ScAddress #include -#ifndef _LSTBOX_HXX //autogen #include -#endif #include #include #include diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index d8b5c7796971..25527d4c432c 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -31,9 +31,7 @@ #include "funcutl.hxx" #include "global.hxx" // ScAddress #include -#ifndef _LSTBOX_HXX //autogen #include -#endif #include #include #include diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx index 715c9d36a101..0b3740ef5712 100644 --- a/sc/source/ui/inc/funcutl.hxx +++ b/sc/source/ui/inc/funcutl.hxx @@ -28,12 +28,8 @@ #ifndef SC_FUNCUTL_HXX #define SC_FUNCUTL_HXX -#ifndef _SCRBAR_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include #include "anyrefdg.hxx" // formula::RefButton diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index ec4dd49705d1..c764e87fb453 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -29,9 +29,7 @@ #define SC_HDRCONT_HXX #include -#ifndef _SELENG_HXX //autogen #include -#endif #include "address.hxx" // --------------------------------------------------------------------------- diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index b500473b2071..59b05cd7a62d 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -28,15 +28,9 @@ #ifndef SC_HIGHRED_HXX #define SC_HIGHRED_HXX -#ifndef _MOREBTN_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _GROUP_HXX //autogen #include -#endif #include #include @@ -44,14 +38,10 @@ #include "rangenam.hxx" #include "anyrefdg.hxx" -#ifndef _MOREBTN_HXX //autogen #include -#endif #include -#ifndef _SVX_ACREDLIN_HXX #include -#endif #include #include "chgtrack.hxx" #include "chgviset.hxx" diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 660d16b62cca..3a7d54b11677 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -30,24 +30,12 @@ #include "address.hxx" -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _GROUP_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _EDIT_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _DIALOG_HXX //autogen #include -#endif #include #include diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 306949ccc053..3119e3676850 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -32,9 +32,7 @@ #include #include -#ifndef _SV_BUTTON_HXX //autogen #include -#endif #include diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index c90e1ea47e94..735b260b6334 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -31,9 +31,7 @@ #include #include -#ifndef _SV_BUTTON_HXX #include -#endif #include #include #include diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index b122c57a19fd..3496fd98edba 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -28,15 +28,9 @@ #ifndef SC_NAMEDLG_HXX #define SC_NAMEDLG_HXX -#ifndef _MOREBTN_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _GROUP_HXX //autogen #include -#endif #include #include "rangenam.hxx" #include "anyrefdg.hxx" diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 65e36565ceb8..9a881d822895 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -28,9 +28,7 @@ #ifndef SC_NOTEMARK_HXX #define SC_NOTEMARK_HXX -#ifndef _MAPMOD_HXX //autogen #include -#endif #include #include "global.hxx" #include "address.hxx" diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 0573ecb86f1e..500f6903a812 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -29,25 +29,15 @@ #include -#ifndef _GROUP_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _FIELD_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include #include #include diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx index 93d5fefa8358..cd4cf83a6efe 100644 --- a/sc/source/ui/inc/optload.hxx +++ b/sc/source/ui/inc/optload.hxx @@ -29,9 +29,7 @@ #include -#ifndef _GROUP_HXX //autogen #include -#endif #include class ScDocument; diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index ae02fdb38114..f9836e33d493 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.hxx @@ -31,9 +31,7 @@ #include "funcutl.hxx" #include "global.hxx" // ScAddress #include -#ifndef _LSTBOX_HXX //autogen #include -#endif #include #include #include diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 426f95399b33..ad880e9943ab 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -31,25 +31,13 @@ #ifndef _SV_HXX #endif -#ifndef _MOREBTN_HXX //autogen #include -#endif #include -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif #include "address.hxx" #include "queryparam.hxx" diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index 8ac0fba4e80d..6e7569dea9a9 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -28,9 +28,7 @@ #ifndef SC_POPMENU_HXX #define SC_POPMENU_HXX -#ifndef _MENU_HXX //autogen #include -#endif #include "scdllapi.h" class SC_DLLPUBLIC ScPopupMenu : public PopupMenu diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index e3966bdc3d37..32e5123fc166 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -32,9 +32,7 @@ #include "pagepar.hxx" #include "editutil.hxx" -#ifndef _PRINT_HXX //autogen #include -#endif class SfxPrinter; class SfxProgress; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index ef245ebf26cf..1fed120f6116 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -31,21 +31,11 @@ #include #include -#ifndef _FIXED_HXX #include -#endif -#ifndef _LSTBOX_HXX #include -#endif -#ifndef _DIALOG_HXX #include -#endif -#ifndef _BUTTON_HXX #include -#endif -#ifndef _MOREBTN_HXX #include -#endif #include #include #include diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 2b77b37c67ad..382d5e803704 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -32,16 +32,10 @@ #include #include -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _SCRBAR_HXX //autogen #include -#endif #include -#ifndef _MOREBTN_HXX //autogen #include -#endif #include "pivot.hxx" #include "anyrefdg.hxx" #include "fieldwnd.hxx" diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index ad12d9c743ad..815c2dbe53c2 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -28,9 +28,7 @@ #ifndef SC_SELECT_HXX #define SC_SELECT_HXX -#ifndef _SELENG_HXX //autogen #include -#endif #include "viewdata.hxx" // ScSplitPos diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6c89c43b3a51..43845fe6f2d3 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -28,16 +28,10 @@ #ifndef SC_SHTABDLG_HXX #define SC_SHTABDLG_HXX -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif #include -#ifndef _DIALOG_HXX //autogen #include -#endif //------------------------------------------------------------------------ diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index ba5b8ca287c3..f0c0d52ac402 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -28,21 +28,13 @@ #ifndef SC_SIMPREF_HXX #define SC_SIMPREF_HXX -#ifndef _GROUP_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _MOREBTN_HXX //autogen #include -#endif #include "anyrefdg.hxx" #include "dbcolect.hxx" #include "expftext.hxx" diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index fc0714558be4..b0cf447be9a2 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -30,9 +30,7 @@ #include -#ifndef _SV_BUTTON_HXX //autogen #include -#endif #include #include #include diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 71d62f964fef..e6d3aace22c8 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -28,9 +28,7 @@ #ifndef SC_TABPAGES_HXX #define SC_TABPAGES_HXX -#ifndef _GROUP_HXX //autogen #include -#endif #include #include diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 6ea4f6e169ed..89731bbe0c9e 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -27,21 +27,11 @@ #ifndef _SC_ZOOMSLIDERTBCONTRL_HXX #define _SC_ZOOMSLIDERTBCONTRL_HXX -#ifndef _WINDOW_HXX //autogen #include -#endif -#ifndef _SFXPOOLITEM_HXX //autogen #include -#endif -#ifndef _SFXTBXCTRL_HXX //autogen #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif #include diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index ed564875142e..7051fc995299 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -32,9 +32,7 @@ #include #include #include -#ifndef _LSTBOX_HXX //autogen #include -#endif #include #include #include "scdllapi.h" diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx old mode 100755 new mode 100644 diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx old mode 100755 new mode 100644 diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx old mode 100755 new mode 100644 diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx old mode 100755 new mode 100644