[ooo-build-commit] .: 2 commits - chart2/source scaddins/source sc/inc sc/source

Petr Mladek pmladek at kemper.freedesktop.org
Tue Oct 5 10:12:06 PDT 2010 

 chart2/source/controller/accessibility/AccStatisticsObject.hxx |    2 -
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |    2 -
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx |    2 -
 chart2/source/controller/dialogs/res_BarGeometry.cxx           |    2 -
 chart2/source/controller/dialogs/res_LegendPosition.cxx        |    2 -
 chart2/source/controller/dialogs/res_LegendPosition.hxx        |    2 -
 chart2/source/controller/dialogs/res_TextSeparator.cxx         |    2 -
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx     |    2 -
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx       |    2 -
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx   |    2 -
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx   |    2 -
 chart2/source/controller/dialogs/tp_AxisPositions.cxx          |    2 -
 chart2/source/controller/dialogs/tp_ChartType.cxx              |    2 -
 chart2/source/controller/dialogs/tp_DataSource.hxx             |    2 -
 chart2/source/controller/dialogs/tp_Scale.cxx                  |    2 -
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx           |    2 -
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx      |    2 -
 chart2/source/controller/inc/RangeSelectionButton.hxx          |    2 -
 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 -
 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx      |    2 -
 chart2/source/controller/main/ChartController_TextEdit.cxx     |    2 -
 chart2/source/inc/LabeledDataSequence.hxx                      |    2 -
 chart2/source/inc/LifeTime.hxx                                 |    2 -
 chart2/source/model/main/ChartModel_Persistence.cxx            |    2 -
 chart2/source/model/main/_serviceregistration_model.cxx        |    2 -
 chart2/source/tools/CharacterProperties.cxx                    |    6 -----
 chart2/source/view/inc/LegendEntryProvider.hxx                 |    2 -
 chart2/source/view/main/ShapeFactory.cxx                       |    2 -
 sc/inc/addincol.hxx                                            |    2 -
 sc/inc/compiler.hxx                                            |    2 -
 sc/inc/dptablecache.hxx                                        |    2 -
 sc/inc/drawpage.hxx                                            |    2 -
 sc/inc/scitems.hxx                                             |    2 -
 sc/inc/viewopti.hxx                                            |    2 -
 sc/source/core/data/dpsave.cxx                                 |    4 ---
 sc/source/core/data/drwlayer.cxx                               |    2 -
 sc/source/core/tool/interpr1.cxx                               |    2 -
 sc/source/core/tool/interpr5.cxx                               |    2 -
 sc/source/ui/Accessibility/AccessibleCell.cxx                  |    6 -----
 sc/source/ui/Accessibility/AccessibleCellBase.cxx              |    6 -----
 sc/source/ui/Accessibility/AccessibleContextBase.cxx           |    4 ---
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx            |    6 -----
 sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx      |    6 -----
 sc/source/ui/Accessibility/AccessibleDocument.cxx              |    8 ------
 sc/source/ui/Accessibility/AccessibleDocumentBase.cxx          |    2 -
 sc/source/ui/Accessibility/AccessibleEditObject.cxx            |    6 -----
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx            |    2 -
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx        |    6 -----
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx     |    2 -
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx          |    2 -
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx           |    6 -----
 sc/source/ui/Accessibility/AccessibleTableBase.cxx             |    4 ---
 sc/source/ui/app/scdll.cxx                                     |    2 -
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx                        |   10 --------
 sc/source/ui/dbgui/dpgroupdlg.cxx                              |    4 ---
 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/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/unoobj/scdetect.cxx                               |    4 ---
 sc/source/ui/view/prevwsh.cxx                                  |    4 ---
 scaddins/source/datefunc/datefunc.cxx                          |    2 -
 108 files changed, 416 deletions(-)

New commits:
commit d97be14b9c7493d17b4fc31fadf374abdb06311f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 15:53:41 2010 +0200

    more removed include guards using fixguard.py

diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index ee2392a..a3afd6f 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 d89518b..8cb2923 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -37,9 +37,7 @@
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <svtools/valueset.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class FixedText
 #include <vcl/fixed.hxx>
 // header for class MetricField
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index d2c0b15..d90eded 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 <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 // header for class SfxItemSet
 #include <svl/itemset.hxx>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index f5b9d2d..4a44cea 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 <vcl/field.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class ListBox
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/drawing/ShadeMode.hpp>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index 9208b51..c1af00e 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 <vcl/field.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#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 a0d3cb9..d8cc6ac 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 <vcl/fixed.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class ColorLB
 #include <svx/dlgctrl.hxx>
 // header for class SvxLightCtl3D
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index d20dc93..0583220 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 <vcl/lstbox.hxx>
 // header for class PushButton, OKButton, CancelButton, HelpButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class FixedText, FixedLine
 #include <vcl/fixed.hxx>
 // header for class SvTabListBox
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index afd644d..bc1b279 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 <vcl/fixed.hxx>
 // header for CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for MetricField
 #include <vcl/field.hxx>
 
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 a2b4826..babd9e8 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 <vcl/button.hxx>
-#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 1dcdee9..0621ab2 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 <vcl/fixed.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index dcbdc66..45bf0c5 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 <vcl/tabctrl.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 #include "TabPageNotifiable.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index da1ac06..2c809bd 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 <vcl/fixed.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <com/sun/star/uno/Sequence.hxx>
 
 //.............................................................................
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 6de8896..e35adbb 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 <vcl/dialog.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class SfxItemSet
 #include <svl/itemset.hxx>
 //for auto_ptr
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index 49db40b..a283217 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 <vcl/dialog.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 //for auto_ptr
 #include <memory>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx
index c01442f..8dc7fea 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 <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 //for auto_ptr
 #include <memory>
 
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index ebfd7a1..0a0ee16 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 <vcl/tabctrl.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class XColorTable
 #include <svx/xtable.hxx>
 
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index 63bb9c0..4fbcb03 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 <svx/svxids.hrc>
-#endif
 #include <svx/xdef.hxx>
 #include <svx/svddef.hxx>
 #include <editeng/eeitem.hxx>
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 73d762f..dbb1ae2 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -31,9 +31,7 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase4.hxx>
 
-#ifndef _COM_SUN_STAR_CHART2_XLABELEDDATASEQUENCE_HPP_
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-#endif
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 7c23a12..b6c401f 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -29,9 +29,7 @@
 
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HDL_
 #include <com/sun/star/uno/Exception.hdl>
-#endif
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx
index b0559b3..36c92a4 100644
--- a/chart2/source/view/inc/LegendEntryProvider.hxx
+++ b/chart2/source/view/inc/LegendEntryProvider.hxx
@@ -29,9 +29,7 @@
 
 #include <com/sun/star/chart2/LegendExpansion.hpp>
 
-#ifndef _COM_SUN_STAR_CHART2_VIEWLEGENDENTRYP_HPP_
 #include <com/sun/star/chart2/ViewLegendEntry.hpp>
-#endif
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace chart
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 7fc6c97..51ef221 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -41,9 +41,7 @@
 #include <rtl/ustring.h>
 #include "scdllapi.h"
 
-#ifndef SC_SCMATRIX_HXX
 #include "scmatrix.hxx"
-#endif
 
 #include <hash_map>
 
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 79e4e27..236d93c 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -47,9 +47,7 @@
 #include <formula/FormulaCompiler.hxx>
 
 
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 
 #ifndef INCLUDED_HASH_MAP
 #include <hash_map>
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 202ab64..9844aa0 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 <svl/zforlist.hxx>
 //end
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index a2c1da0..376c689 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 <svx/fmpage.hxx>
-#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 2da2bf1..b9b1bde 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 <svx/svxids.hrc>
-#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 f6a1a99..d65f202 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -30,9 +30,7 @@
 
 #include <svx/optgrid.hxx>
 
-#ifndef _SVX_SVXIDS_HRC //autogen
 #include <svx/svxids.hrc>
-#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 51313ba..28f4a6b 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#endif
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx
index a897485..1f3624f 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 b40ad8d..837744b 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 <editeng/svxenum.hxx>
 
 class EditTextObject;
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 9958d0e..c2f69d2 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 <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 
@@ -45,9 +39,7 @@
 #include "anyrefdg.hxx"
 #include <vcl/lstbox.hxx>
 
-#ifndef _SVX_ACREDLIN_HXX
 #include <svx/ctredlin.hxx>
-#endif
 #include <svx/simptabl.hxx>
 
 #ifndef _SVARRAY_HXX
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index a61add1..ee4a03d 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 <vcl/imagebtn.hxx>
-#endif
-#ifndef _EDIT_HXX
 #include <vcl/edit.hxx>
-#endif
-#ifndef _ACCEL_HXX
 #include <vcl/accel.hxx>
-#endif
 #include <sfx2/basedlgs.hxx>
 #include "address.hxx"
 #include "cell.hxx"
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 0d4597a..a2912aa 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 <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <anyrefdg.hxx>
 
 class ScDocument;
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 5280676..0d34f56 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -31,24 +31,12 @@
 #define SC_ASCIIOPT_HXX
 
 #include <tools/string.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 _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <tools/stream.hxx>
 #include <svx/txencbox.hxx>
 #include "csvtablebox.hxx"
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index e145b99..fe5ce37 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 <vcl/virdev.hxx>
-#endif
-#ifndef SV_FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
-#ifndef SV_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef SV_MOREBTN_HXX
 #include <vcl/morebtn.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 #include <svtools/scriptedtext.hxx>
 #include <svx/framelinkarray.hxx>
 #include "scdllapi.h"
diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx
index 012ce4d..d2e6568 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 <sfx2/ipclient.hxx>
-#endif
 
 class ScDocument;
 class ScTabViewShell;
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 9048a03..a661371 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 <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#endif
 #include "global.hxx"
 #include "anyrefdg.hxx"
 
diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx
index 36d1e12..e881214 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 <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
 #include "sc.hrc"
 #include "scresid.hxx"
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index a4379bb..55849ba 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 <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 2962df9..1564a0d 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 <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 4e72c12..e172134 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 <vcl/combobox.hxx>
-#endif
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#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 5afc245..af7899d 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 <vcl/fixed.hxx>
-#endif
-#ifndef _DIALOG_HXX
 #include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/field.hxx>
 #include <svx/checklbx.hxx>
 #include "editfield.hxx"
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 1e9b34d..0736615 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -32,17 +32,11 @@
 #include <svl/lstner.hxx>
 #include <svtools/stdctrl.hxx>
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
 
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#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 4f47d9a..09d8496 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 <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 "global.hxx"
 
 class ScDocument;
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 2e5cd97..b4baa01 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 <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
 #include "global.hxx" // -> ScQueryParam
 #include "address.hxx"
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index 9e1129f..12ced03 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 <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 
 //----------------------------------------------------------------------------
 
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 9896dd0..de7363c 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 <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/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index f9a2443..1f9798d 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 <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/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx
index b5fd76f..80c17c0 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 <vcl/scrbar.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <svtools/svmedit.hxx>
 #include "anyrefdg.hxx"		// formula::RefButton
 
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 502b036..16cff1b 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -29,9 +29,7 @@
 #define SC_HDRCONT_HXX
 
 #include <vcl/window.hxx>
-#ifndef _SELENG_HXX //autogen
 #include <vcl/seleng.hxx>
-#endif
 #include "address.hxx"
 
 // ---------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index cd406dd..cc588fa 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 <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 
@@ -44,14 +38,10 @@
 #include "rangenam.hxx"
 #include "anyrefdg.hxx"
 
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#endif
 #include <vcl/lstbox.hxx>
 
-#ifndef _SVX_ACREDLIN_HXX
 #include <svx/ctredlin.hxx>
-#endif
 #include <svx/simptabl.hxx>
 #include "chgtrack.hxx"
 #include "chgviset.hxx"
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 814fd23..ccb1244 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 <vcl/button.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 
 #include <sfx2/objsh.hxx>
 #include <vcl/field.hxx>
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index 09865bb..9e8c861 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -32,9 +32,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 
 
 #include <vcl/dialog.hxx>
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index cbcba4f..4719270 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <vcl/dialog.hxx>
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 66976c6..fc37042 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 <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include "rangenam.hxx"
 #include "anyrefdg.hxx"
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 02a1835..8559ed4 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 <vcl/mapmod.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include "global.hxx"
 #include "address.hxx"
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 7dd4867..cc96625 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -29,25 +29,15 @@
 
 #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 <svx/strarray.hxx>
diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx
index 0eed9f6..b3a3313 100644
--- a/sc/source/ui/inc/optload.hxx
+++ b/sc/source/ui/inc/optload.hxx
@@ -29,9 +29,7 @@
 
 #include <sfx2/tabdlg.hxx>
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <vcl/fixed.hxx>
 
 class ScDocument;
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index 74324bb..0e688b7 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 <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/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 096bb53..5be0199 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 <vcl/morebtn.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
-#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
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
 #include "address.hxx"
 #include "queryparam.hxx"
 
diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx
index e4c611f..7bd20fd 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 <vcl/menu.hxx>
-#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 a4cb164..03f2366 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 <vcl/print.hxx>
-#endif
 
 class SfxPrinter;
 class SfxProgress;
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 2c813cc..208305a 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -31,21 +31,11 @@
 #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
 
-#ifndef _FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _DIALOG_HXX
 #include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef _MOREBTN_HXX
 #include <vcl/morebtn.hxx>
-#endif
 #include <vcl/field.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svx/checklbx.hxx>
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 5f77de2..e3829d7 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -32,16 +32,10 @@
 #include <memory>
 #include <boost/shared_ptr.hpp>
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#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 47d1669..a535428 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 <vcl/seleng.hxx>
-#endif
 
 #include "viewdata.hxx"		// ScSplitPos
 
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 876e246..912a69d 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 <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <svtools/tooltiplbox.hxx>
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 
 //------------------------------------------------------------------------
 
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 1030d2c..49a1ca0 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 <vcl/group.hxx>
-#endif
 
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#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 a6e92c8..38a95de 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -30,9 +30,7 @@
 
 #include <vcl/dialog.hxx>
 
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index a69ad20..e018112 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 <vcl/group.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 358be70..aa16406 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 <vcl/window.hxx>
-#endif
-#ifndef _SFXPOOLITEM_HXX   //autogen
 #include <svl/poolitem.hxx>
-#endif
-#ifndef _SFXTBXCTRL_HXX    //autogen
 #include <sfx2/tbxctrl.hxx>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
-#endif
 #include <svx/zoomslideritem.hxx>
 
 
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index cf3c004..5b81ad0 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -32,9 +32,7 @@
 #include <svx/pageitem.hxx>
 #include <svtools/stdctrl.hxx>
 #include <vcl/group.hxx>
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <vcl/virdev.hxx>
 #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
commit cc5b0c6794480975828bb36fcaa9cff3a0f6df56
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Oct 4 16:58:12 2010 +0200

    remove include guards using fixguard.py

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index bc4e784..cd3a0c8 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -44,9 +44,7 @@
 #include <com/sun/star/chart2/PieChartOffsetMode.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 // header for class Image
 #include <vcl/image.hxx>
 // header for class Bitmap
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 5a08244..584d75e 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -33,9 +33,7 @@
 #include "Strings.hrc"
 #include "ResId.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 19292ec..4121e6e 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -37,9 +37,7 @@
 #include "macros.hxx"
 #include "LegendHelper.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/LegendExpansion.hpp>
 
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 45b57a6..49d5c88 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -34,9 +34,7 @@
 #include "ResId.hxx"
 #include "macros.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 2e8abdb..7b85c35 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -37,9 +37,7 @@
 #include "CommonConverters.hxx"
 #include "NoWarningThisInCTOR.hxx"
 
-#ifndef _SVX_DIALOGS_HRC
 #include "svx/dialogs.hrc"
-#endif
 // header for define SVX_RES
 #include <svx/dialmgr.hxx>
 #include <rtl/math.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9c541d4..8c0498d 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -36,9 +36,7 @@
 #include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <rtl/math.hxx>
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 11a6d7a..d26e13a 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -39,9 +39,7 @@
 #include "ControllerLockGuard.hxx"
 #include "macros.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 2f70852..f016d9e 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -36,9 +36,7 @@
 #include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <rtl/math.hxx>
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index adba51c..dce63db 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -48,9 +48,7 @@
 // header for class SvxForbiddenCharactersTable
 #include <editeng/forbiddencharacterstable.hxx>
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 
 // header for class SvxShape
 #include <svx/unoshape.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
old mode 100755
new mode 100644
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 9e1c003..c15b151 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -45,9 +45,7 @@
 // header for class SdrOutliner
 #include <svx/svdoutl.hxx>
 #include <svx/svxdlg.hxx>
-#ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
-#endif
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
old mode 100755
new mode 100644
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index a2cda82..78e3b35 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -53,9 +53,7 @@
 #include <com/sun/star/io/XSeekable.hpp>
 
 #include <ucbhelper/content.hxx>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
 #include <vcl/cvtgrf.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <vcl/svapp.hxx>
diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx
index a3f3f19..ff073c8 100644
--- a/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/chart2/source/model/main/_serviceregistration_model.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
 #include <cppuhelper/implementationentry.hxx>
-#ifndef _CHARTMODEL_HXX
 #include "ChartModel.hxx"
-#endif
 
 #include "Diagram.hxx"
 #include "Legend.hxx"
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 4f56112..0482832 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -54,15 +54,9 @@
 
 
 // header for struct SvtLinguConfig
-#ifndef _SVTOOLS_LINGUCFG_HXX_
 #include <unotools/lingucfg.hxx>
-#endif
-#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
 #include <i18npool/mslangid.hxx>
-#endif
-#ifndef _SV_OUTDEV_HXX
 #include <vcl/outdev.hxx>
-#endif
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
old mode 100755
new mode 100644
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
old mode 100755
new mode 100644
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index e4985fd..f431b05 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -59,9 +59,7 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
 
-#ifndef _BGFX_VECTOR_B2DPOINT_HXX
 #include <basegfx/point/b2dpoint.hxx>
-#endif
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
 #include <algorithm>
diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 84b5bdb..6d182b3 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -59,12 +59,8 @@
 #include "dptabsrc.hxx"
 #include "dpglobal.hxx"
 using namespace ScDPGlobal;
-#ifndef _COM_SUN_STAR_SHEET_DATAPILOTFIELDREFERENCETYPE_HPP_
 #include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SHEET_DATAPILOTFIELDREFERENCEITEMTYPE_HPP_
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
-#endif
 using namespace com::sun::star::sheet;
 // End Comments
 
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
old mode 100755
new mode 100644
index 6c154f6..269ef67
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -82,9 +82,7 @@
 #include "attrib.hxx"
 #include "charthelper.hxx"
 
-#ifndef _SV_FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 
 #define DET_ARROW_OFFSET	1000
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d4c48f3..6f87a48 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -58,9 +58,7 @@
 #include "attrib.hxx"
 #include "jumpmatrix.hxx"
 
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
 #include <comphelper/processfactory.hxx>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index e342a89..3fc3363 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -30,9 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef INCLUDED_RTL_MATH_HXX
 #include <rtl/math.hxx>
-#endif
 #include <rtl/logfile.hxx>
 #include <string.h>
 #include <math.h>
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index bb7b0ea..c5eb800 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -45,15 +45,9 @@
 #include "dociter.hxx"
 #include "cell.hxx"
 
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <rtl/uuid.h>
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 666d88f..eab3512 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -38,17 +38,11 @@
 #include "cell.hxx"
 #include "unoguard.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 #include "unonames.hxx"
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <tools/debug.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 3bdfe8c..3ed7f22 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -33,16 +33,12 @@
 #include "unoguard.hxx"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
 #include <toolkit/helper/convert.hxx>
 #include <svl/smplhint.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 5cfef56..8b3673f 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -31,12 +31,8 @@
 // ============================================================================
 #include "AccessibleCsvControl.hxx"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
@@ -45,9 +41,7 @@
 #include <rtl/uuid.h>
 #include <toolkit/helper/convert.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
 #include <comphelper/sequence.hxx>
 #include "scitems.hxx"
 #include <editeng/fontitem.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 7d72e4d..c8b5063 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -31,17 +31,11 @@
 #include "unoguard.hxx"
 #include "fieldwnd.hxx"
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
 #include <rtl/uuid.h>
 #include <tools/gen.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 85c44fe..b7f085b 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -42,23 +42,15 @@
 #include "gridwin.hxx"
 #include "AccessibleEditObject.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONTYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#endif
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svx/svdpage.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
index c12caec..e542175 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
@@ -31,9 +31,7 @@
 
 #include "AccessibleDocumentBase.hxx"
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
 
 using namespace	::com::sun::star;
 using namespace	::com::sun::star::accessibility;
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 41a23b2..f0f9964 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -36,15 +36,9 @@
 #include "scmod.hxx"
 #include "inputhdl.hxx"
 
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <svx/AccessibleTextHelper.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index c156748..c449267 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -40,9 +40,7 @@
 #include "scitems.hxx"
 #include "attrib.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 06d234d..66f4fa3 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -36,16 +36,10 @@
 #include "prevwsh.hxx"
 #include "prevloc.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <editeng/editobj.hxx>
 #include <svx/AccessibleTextHelper.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 65d87a0..311e227 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -40,9 +40,7 @@
 #include "miscuno.hxx"
 #include "prevloc.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 98c7e5a..9129f21 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -40,9 +40,7 @@
 #include "attrib.hxx"
 #include "document.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 42e2790..4c91cce 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -39,15 +39,9 @@
 #include "hints.hxx"
 #include "scmod.hxx"
 
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
 #include <unotools/accessiblestatesethelper.hxx>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
 #include <rtl/uuid.h>
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index d8a8fe9..c55d9b2 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -34,13 +34,9 @@
 #include "document.hxx"
 #include "unoguard.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <rtl/uuid.h>
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 2cb8016..1c1064c 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -33,9 +33,7 @@
 #include <editeng/eeitem.hxx>
 
 
-#ifndef _FM_FMOBJFAC_HXX
 #include <svx/fmobjfac.hxx>
-#endif
 #include <svx/objfac3d.hxx>
 #include <svx/tbxcolor.hxx>
 
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 04d2d1c..7106f8f 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -25,21 +25,11 @@
  *
 ************************************************************************/
 #include "precompiled_sc.hxx"
-#ifndef _SC_ZOOMSLIDERTBCONTRL_HXX
 #include "tbzoomsliderctrl.hxx"
-#endif
-#ifndef _SV_IMAGE_HXX
 #include <vcl/image.hxx>
-#endif
-#ifndef _SV_TOOLBOX_HXX
 #include <vcl/toolbox.hxx>
-#endif
-#ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _SV_GRADIENT_HXX
 #include <vcl/gradient.hxx>
-#endif
 #include <svl/itemset.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 487a0b8..6c22db9 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -34,14 +34,10 @@
 
 
 #include "dpgroupdlg.hxx"
-#ifndef SC_DPGROUPDLG_HRC
 #include "dpgroupdlg.hrc"
-#endif
 #include <tools/resary.hxx>
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
 // ============================================================================
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
old mode 100755
new mode 100644
index e8c5112..1b8ce06
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -37,9 +37,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -53,9 +51,7 @@
 
 #include <framework/interaction.hxx>
 
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <ucbhelper/simpleinteractionrequest.hxx>
 
 #include <svtools/parhtml.hxx>
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
old mode 100755
new mode 100644
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 72ee508..2b80369 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -52,9 +52,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 
-#ifndef _SVX_ZOOMSLIDERITEM_HXX
 #include <svx/zoomslideritem.hxx>
-#endif
 #include "prevwsh.hxx"
 #include "preview.hxx"
 #include "printfun.hxx"
@@ -77,9 +75,7 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 
-#ifndef _SVX_ZOOM_HXX
 #include <svx/zoom_def.hxx>
-#endif
 
 #include "sc.hrc"
 #include "scabstdlg.hxx"
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 9d2b235..c61c36d 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -32,9 +32,7 @@
 //------------------------------------------------------------------
 
 #include "datefunc.hxx"
-#ifndef _SCA_DATEFUNC_HRC
 #include "datefunc.hrc"
-#endif
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>

More information about the ooo-build-commit mailing list