[ooo-build-commit] .: 3 commits - accessibility/bridge accessibility/inc accessibility/source automation/source basctl/inc basctl/source crashrep/source cui/source embedserv/source extensions/inc extensions/source extensions/workben forms/source lingucomponent/source package/inc package/source setup_native/source xmlsecurity/inc xmlsecurity/source
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Oct 5 10:12:16 PDT 2010
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx | 6 --
accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 2
accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx | 2
accessibility/inc/accessibility/helper/accresmgr.hxx | 2
accessibility/inc/accessibility/helper/characterattributeshelper.hxx | 2
accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx | 2
accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx | 2
accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx | 6 --
accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx | 6 --
accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx | 2
accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx | 4 -
accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx | 2
accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx | 2
accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx | 2
accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx | 4 -
accessibility/source/extended/accessibletablistbox.cxx | 2
accessibility/source/extended/accessibletablistboxtable.cxx | 2
accessibility/source/extended/textwindowaccessibility.cxx | 2
accessibility/source/helper/accresmgr.cxx | 2
accessibility/source/inc/floatingwindowaccessible.hxx | 2
automation/source/app/testbasi.cxx | 2
automation/source/miniapp/editwin.cxx | 2
automation/source/miniapp/editwin.hxx | 2
automation/source/miniapp/servres.hxx | 18 -------
automation/source/miniapp/testapp.cxx | 2
automation/source/miniapp/testapp.hxx | 18 -------
automation/source/server/XMLParser.cxx | 2
automation/source/server/editwin.hxx | 4 -
automation/source/server/profiler.cxx | 2
automation/source/server/server.cxx | 2
automation/source/server/sta_list.cxx | 4 -
automation/source/server/statemnt.cxx | 24 ----------
automation/source/testtool/cmdstrm.cxx | 2
automation/source/testtool/comm_bas.cxx | 4 -
automation/source/testtool/comm_bas.hxx | 2
automation/source/testtool/cretstrm.cxx | 2
automation/source/testtool/objtest.cxx | 13 -----
automation/source/testtool/tcommuni.cxx | 2
basctl/inc/pch/precompiled_basctl.hxx | 2
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/basidectrlr.cxx | 2
basctl/source/basicide/basobj3.cxx | 2
basctl/source/basicide/bastypes.cxx | 4 -
basctl/source/basicide/brkdlg.hxx | 2
basctl/source/basicide/macrodlg.cxx | 2
basctl/source/basicide/macrodlg.hxx | 2
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/basicide/moduldlg.cxx | 4 -
basctl/source/basicide/moduldlg.hxx | 2
basctl/source/basicide/objdlg.cxx | 2
basctl/source/dlged/dlged.cxx | 2
basctl/source/dlged/dlgedobj.cxx | 2
basctl/source/dlged/dlgedview.cxx | 2
basctl/source/dlged/managelang.cxx | 2
basctl/source/dlged/propbrw.cxx | 6 --
basctl/source/inc/baside3.hxx | 2
basctl/source/inc/basidesh.hxx | 6 --
basctl/source/inc/basobj.hxx | 2
basctl/source/inc/managelang.hxx | 6 --
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 8 ---
cui/source/dialogs/commonlingui.hxx | 2
cui/source/inc/autocdlg.hxx | 2
cui/source/inc/backgrnd.hxx | 4 -
cui/source/inc/cuifmsearch.hxx | 8 ---
cui/source/inc/cuigrfflt.hxx | 2
cui/source/inc/cuitbxform.hxx | 2
cui/source/inc/dlgname.hxx | 8 ---
cui/source/inc/grfpage.hxx | 6 --
cui/source/inc/hlmarkwn.hxx | 2
cui/source/inc/iconcdlg.hxx | 2
cui/source/inc/labdlg.hxx | 6 --
cui/source/inc/linkdlg.hxx | 2
cui/source/inc/macropg.hxx | 2
cui/source/inc/multipat.hxx | 2
cui/source/inc/numpages.hxx | 2
cui/source/inc/optasian.hxx | 2
cui/source/inc/optdict.hxx | 2
cui/source/inc/optpath.hxx | 6 --
cui/source/inc/pastedlg.hxx | 2
cui/source/inc/postdlg.hxx | 6 --
cui/source/inc/showcols.hxx | 2
cui/source/inc/textattr.hxx | 4 -
cui/source/inc/transfrm.hxx | 2
cui/source/inc/zoom.hxx | 22 ---------
cui/source/options/doclinkdialog.hxx | 2
cui/source/options/optchart.hxx | 2
cui/source/options/optctl.hxx | 2
cui/source/options/optfltr.hxx | 4 -
cui/source/options/optjsearch.hxx | 2
cui/source/options/optupdt.hxx | 2
embedserv/source/embed/docholder.cxx | 4 -
embedserv/source/inc/embeddoc.hxx | 2
embedserv/source/inc/servprov.hxx | 2
extensions/inc/appsettings.hxx | 2
extensions/source/abpilot/abpfinalpage.cxx | 2
extensions/source/abpilot/abspage.hxx | 2
extensions/source/abpilot/admininvokationimpl.cxx | 4 -
extensions/source/abpilot/fieldmappingimpl.cxx | 4 -
extensions/source/bibliography/bibbeam.cxx | 2
extensions/source/bibliography/bibload.cxx | 4 -
extensions/source/bibliography/bibview.cxx | 2
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/general.hxx | 2
extensions/source/bibliography/toolbar.cxx | 4 -
extensions/source/config/ldap/ldapuserprofilebe.cxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 4 -
extensions/source/dbpilots/controlwizard.hxx | 4 -
extensions/source/dbpilots/wizardservices.cxx | 2
extensions/source/inc/componentmodule.cxx | 2
extensions/source/logging/csvformatter.cxx | 8 ---
extensions/source/logging/loghandler.cxx | 2
extensions/source/ole/servprov.hxx | 2
extensions/source/plugin/base/context.cxx | 2
extensions/source/preload/oemwiz.cxx | 4 -
extensions/source/preload/oemwiz.hxx | 2
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/browserlistbox.hxx | 4 -
extensions/source/propctrlr/controlfontdialog.cxx | 2
extensions/source/propctrlr/defaultforminspection.cxx | 6 --
extensions/source/propctrlr/eformshelper.cxx | 4 -
extensions/source/propctrlr/fontdialog.cxx | 12 -----
extensions/source/propctrlr/formbrowsertools.cxx | 4 -
extensions/source/propctrlr/formcontroller.cxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 4 -
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/formmetadata.cxx | 4 -
extensions/source/propctrlr/formmetadata.hxx | 2
extensions/source/propctrlr/handlerhelper.cxx | 4 -
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/listselectiondlg.cxx | 6 --
extensions/source/propctrlr/listselectiondlg.hxx | 2
extensions/source/propctrlr/modulepcr.cxx | 4 -
extensions/source/propctrlr/newdatatype.cxx | 6 --
extensions/source/propctrlr/newdatatype.hxx | 2
extensions/source/propctrlr/pcrcommon.cxx | 4 -
extensions/source/propctrlr/pcrservices.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 8 ---
extensions/source/propctrlr/propcontroller.hxx | 2
extensions/source/propctrlr/propertycontrolextender.cxx | 2
extensions/source/propctrlr/propertyhandler.hxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/selectlabeldialog.hxx | 4 -
extensions/source/propctrlr/sqlcommanddesign.cxx | 4 -
extensions/source/propctrlr/standardcontrol.cxx | 4 -
extensions/source/propctrlr/stringrepresentation.cxx | 6 --
extensions/source/propctrlr/taborder.cxx | 6 --
extensions/source/propctrlr/taborder.hxx | 8 ---
extensions/source/scanner/grid.hxx | 2
extensions/source/scanner/sanedlg.hxx | 2
extensions/source/scanner/scanner.hxx | 6 --
extensions/source/svg/svgcom.hxx | 8 ---
extensions/source/update/check/updatecheckconfig.cxx | 2
extensions/source/update/check/updatehdl.hxx | 2
extensions/source/update/check/updateprotocol.cxx | 2
extensions/source/xmlextract/xmxcom.hxx | 2
extensions/workben/testpgp.cxx | 2
forms/source/component/CheckBox.cxx | 2
forms/source/component/Columns.cxx | 4 -
forms/source/component/DatabaseForm.hxx | 2
forms/source/component/EditBase.cxx | 4 -
forms/source/component/File.cxx | 2
forms/source/component/FixedText.cxx | 2
forms/source/component/GroupBox.cxx | 2
forms/source/component/Hidden.cxx | 2
forms/source/component/RadioButton.cxx | 2
forms/source/component/formcontrolfont.cxx | 2
forms/source/component/imgprod.cxx | 2
forms/source/misc/listenercontainers.cxx | 2
forms/source/misc/property.cxx | 2
forms/source/resource/frm_resource.cxx | 2
forms/source/richtext/parametrizedattributedispatcher.cxx | 2
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 2
forms/source/richtext/richtextvclcontrol.hxx | 2
forms/source/richtext/rtattributehandler.cxx | 2
forms/source/richtext/specialdispatchers.cxx | 2
forms/source/xforms/datatyperepository.cxx | 6 --
forms/source/xforms/datatypes.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
package/inc/ZipFile.hxx | 2
package/inc/ZipOutputStream.hxx | 4 -
package/inc/ZipPackage.hxx | 2
package/inc/ZipPackageBuffer.hxx | 2
package/source/manifest/ManifestExport.cxx | 8 ---
package/source/manifest/ManifestImport.cxx | 2
package/source/manifest/ManifestImport.hxx | 2
package/source/manifest/ManifestReader.cxx | 10 ----
package/source/manifest/ManifestReader.hxx | 4 -
package/source/manifest/ManifestWriter.cxx | 10 ----
package/source/manifest/ManifestWriter.hxx | 4 -
package/source/manifest/UnoRegister.cxx | 2
package/source/zipapi/EntryInputStream.hxx | 4 -
package/source/zipapi/XFileStream.hxx | 4 -
package/source/zipapi/ZipFile.cxx | 2
package/source/zippackage/ContentInfo.hxx | 2
package/source/zippackage/ZipPackageEntry.hxx | 2
package/source/zippackage/ZipPackageFolderEnumeration.hxx | 4 -
package/source/zippackage/ZipPackageStream.hxx | 4 -
package/source/zippackage/zipfileaccess.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/register.hxx | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.hxx | 2
xmlsecurity/inc/xmlsecurity/biginteger.hxx | 2
xmlsecurity/source/component/certificatecontainer.hxx | 4 -
xmlsecurity/source/dialogs/stbcontrl.cxx | 5 --
xmlsecurity/source/framework/encryptorimpl.hxx | 2
xmlsecurity/source/framework/signatureengine.hxx | 2
xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 4 -
xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 4 -
xmlsecurity/source/xmlsec/errorcallback.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 6 --
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 4 -
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 6 --
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx | 4 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 4 -
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 6 --
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 4 -
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 4 -
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 8 ---
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 4 -
xmlsecurity/source/xmlsec/xmlstreamio.hxx | 2
245 files changed, 856 deletions(-)
New commits:
commit 54a0ce836f8d7390e59651ee10c824ad1f742add
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 17:41:44 2010 +0200
fixed cui includes after removing the guards
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index cb0c5f6..b00ff29 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -35,24 +35,6 @@
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
-// define ----------------------------------------------------------------
-/* CHINA001
-#define ZOOMBTN_OPTIMAL ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004)
-*/
-#include "zoom_def.hxx"
-// class SvxZoomDialog ---------------------------------------------------
-/*
- {k:\svx\prototyp\dialog\zoom.bmp}
-
- [Beschreibung]
- Mit diesem Dialog wird ein Zoom-Faktor eingestellt.
-
- [Items]
- SvxZoomItem <SID_ATTR_ZOOM>
-*/
-
#include <layout/layout-pre.hxx>
class SvxZoomDialog : public SfxModalDialog
commit e22d09f9ec66473a89ce4c8cbc943c97ae450027
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:53:46 2010 +0200
more removed include guards using fixguard.py
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index d6bab94..6eeb4ee 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
#include "accessibility/extended/accessiblebrowseboxcell.hxx"
-#endif
#include <cppuhelper/implbase2.hxx>
#include <vcl/wintypes.hxx>
// ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
old mode 100755
new mode 100644
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
index bdfe2a1..b7a9f30 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -27,9 +27,7 @@
#ifndef ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
#define ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
-#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
#include "accessiblebrowseboxcell.hxx"
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
index 5825dc9..2a7636b 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_HELPER_TKARESMGR_HXX
#define ACCESSIBILITY_HELPER_TKARESMGR_HXX
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
class SimpleResMgr;
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
index 905e075..767d497 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
#define ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX
#include <com/sun/star/uno/Sequence.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/font.hxx>
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
index 5c0c8a1..797258e 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
#include <tools/link.hxx>
#include <vector>
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
index e156a47..3f39784 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
@@ -30,9 +30,7 @@
#include <accessibility/standard/accessiblemenubasecomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index 4761980..e104d84 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -30,13 +30,9 @@
#include <map>
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
typedef ::cppu::ImplHelper2<
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
index e9a3f09..df09ec4 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
index 0828143..aa210f9 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
index acbbee6..4b75737 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
@@ -30,12 +30,8 @@
#include <map>
#include <accessibility/standard/vclxaccessiblebox.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
/** The accessible combobox has two children. The first is the text field
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
index 3c94401..dac9d87 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
@@ -29,17 +29,11 @@
#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
#include <accessibility/standard/vclxaccessiblebox.hxx>
-#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTEDIT_HXX
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAKREF_HXX
#include <cppuhelper/weakref.hxx>
-#endif
/** The accessible drop down combobox has two children. The first is the
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
index d35f48a..98d785c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
@@ -31,12 +31,8 @@
#include <accessibility/standard/vclxaccessiblebox.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAKREF_HXX
#include <cppuhelper/weakref.hxx>
-#endif
/** The accessible drop down combobox has two children. The first is the
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
index a06328d..b17e265 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
@@ -30,13 +30,9 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index f2f2713..bd63f0d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -32,15 +32,11 @@
#include <functional>
#include "accessibility/standard/vclxaccessiblelistitem.hxx"
#include <accessibility/standard/vclxaccessibleedit.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
typedef ::cppu::ImplHelper2<
::com::sun::star::accessibility::XAccessible,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
index 1c55b65..9ede035 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
@@ -31,15 +31,9 @@
#include <accessibility/standard/vclxaccessiblelist.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX
#include <comphelper/broadcasthelper.hxx>
-#endif
-#ifndef _COMPHELPER_UNO3_HXX
#include <comphelper/uno3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleSelection
> VCLXAccessibleListBoxList_BASE;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
index 08d01bf..2a27a80 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -35,12 +35,8 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_COMPBASE6_HXX
#include <cppuhelper/compbase6.hxx>
-#endif
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX
#include <comphelper/broadcasthelper.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
// forward ---------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
index d08ba39..d455c3e 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
@@ -31,9 +31,7 @@
#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
index a47f720..3d8be17 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
#include <cppuhelper/implbase3.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
index 8d1a7b7..68ac9e0 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
@@ -30,14 +30,10 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
index 5d957e8..c5c02e7 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
@@ -30,14 +30,10 @@
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
// ----------------------------------------------------
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
index 27bf4ef..81268ea 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessibletexthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
class StatusBar;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
index e72f5f9..c855a66 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessibletexthelper.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
class TabControl;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
index 28b08dc..5f319a6 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
@@ -30,9 +30,7 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
typedef ::cppu::ImplHelper1<
::com::sun::star::accessibility::XAccessible
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 4965e9b..70b0210 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -28,9 +28,7 @@
#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
@@ -38,9 +36,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_IMPLBASE4_HXX
#include <cppuhelper/implbase4.hxx>
-#endif
#include <comphelper/accessibletexthelper.hxx>
#include <tools/solar.h>
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx
index 477cd35..6560788 100644
--- a/accessibility/source/inc/floatingwindowaccessible.hxx
+++ b/accessibility/source/inc/floatingwindowaccessible.hxx
@@ -28,9 +28,7 @@
#ifndef ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
#define ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#endif
class FloatingWindowAccessible : public VCLXAccessibleComponent
{
diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx
index 7608a9b..c935b82 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -27,9 +27,7 @@
#ifndef _editwin
#define _editwin
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <vcl/floatwin.hxx>
#include <svtools/svmedit.hxx>
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index 685009b..4e52ea1 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -25,33 +25,15 @@
*
************************************************************************/
#include <svtools/svmedit.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#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 _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
class ModalDialogGROSSER_TEST_DLG : public ModalDialog
{
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index c0be2ec..c6f138f 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -28,33 +28,15 @@
#define _TESTAPP_HXX
#include <vcl/svapp.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#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 _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
#include <svl/poolitem.hxx>
diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx
index 7f65f08..9f610ca 100644
--- a/automation/source/server/editwin.hxx
+++ b/automation/source/server/editwin.hxx
@@ -29,13 +29,9 @@
#if OSL_DEBUG_LEVEL > 1
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <svtools/svmedit.hxx>
-#endif
class ImpWorkWindow;
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index 35defdc..a9c4609 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -29,9 +29,7 @@
#define _COMM_BAS_HXX
#include <basic/sbxfac.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
#include <basic/sbxvar.hxx>
-#endif
#include <basic/sbxobj.hxx>
class CommunicationManagerClientViaSocket;
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 6cc702d..ba8b89c 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -42,9 +42,7 @@
#include "com/sun/star/resource/XStringResourcePersistence.hpp"
#include "com/sun/star/script/XLibraryContainer.hpp"
#include "com/sun/star/script/XLibraryContainerPassword.hpp"
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include "com/sun/star/script/XLibraryContainer2.hpp"
-#endif
#include "com/sun/star/task/XStatusIndicator.hpp"
#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index b78eaf8..752331f 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -40,9 +40,7 @@ class SvxSearchItem;
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <basic/sbmod.hxx>
#include <vcl/split.hxx>
#include "svl/lstner.hxx"
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index c841240..35874af 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -32,9 +32,7 @@
#include <bastypes.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 73a8485..a7def9f 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -35,9 +35,7 @@
#include <sfx2/basedlgs.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#define MACRO_CLOSE 10
#define MACRO_OK_RUN 11
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index c6fff7c..e96b61a 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -33,9 +33,7 @@
#include <bastype2.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/tabdlg.hxx>
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 027228c..290fc81 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -35,9 +35,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_
#include <com/sun/star/script/XLibraryContainer.hpp>
-#endif
class Printer;
class StarBASIC;
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 56ce8e4..13c4720 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -33,18 +33,12 @@
#include "doceventnotifier.hxx"
#include <sfx2/viewfac.hxx>
#include <sfx2/shell.hxx>
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <sfx2/viewsh.hxx>
#include <svx/ifaceids.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
#include <com/sun/star/container/XContainerListener.hpp>
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index eb11154..b9dc1ee 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -31,9 +31,7 @@
#include <tools/string.hxx>
#include <svl/lstner.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 1a12e64..549438a 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -29,15 +29,9 @@
#define _BASCTL_MANAGELANG_HXX
#include <vcl/dialog.hxx>
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svx/langbox.hxx>
#include <svx/checklbx.hxx>
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 0a15def..3adbaa5 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -32,9 +32,7 @@
#include <svtools/stdctrl.hxx>
#include <vcl/edit.hxx>
#include <svtools/svxbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/dialog.hxx>
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 848b2eb..36e0fbd 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -61,9 +61,7 @@ public:
#ifdef _OFA_AUTOCDLG_CXX
#include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <svtools/svtabbx.hxx>
#include <svx/simptabl.hxx>
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 6395946..65f83eb 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -29,13 +29,9 @@
// include ---------------------------------------------------------------
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _GRAPH_HXX //autogen
#include <vcl/graph.hxx>
-#endif
#include <svtools/valueset.hxx>
#include <svx/dlgctrl.hxx>
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index d5838e2..16b483a 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -35,21 +35,13 @@
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
#include <tools/link.hxx>
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index beaf0bb..1da6a7d 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -30,9 +30,7 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/dialog.hxx>
#include <vcl/group.hxx>
diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index afec3d4..5017ab8 100644
--- a/cui/source/inc/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
@@ -5,9 +5,7 @@
#include <vcl/field.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
//========================================================================
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 0df32f8..89b8fb8 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -28,18 +28,10 @@
#define _SVX_DLG_NAME_HXX
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <vcl/fixed.hxx>
// #i68101#
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 2881b19..d728d04 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -28,15 +28,9 @@
#ifndef _SVX_GRFPAGE_HXX
#define _SVX_GRFPAGE_HXX
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <vcl/graph.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 3347ed3..e10eaf0 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/svtreebx.hxx>
#include "hlmarkwn_def.hxx" //ADD CHINA001
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index d756588..f24e31e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -30,9 +30,7 @@
#include <vcl/tabpage.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/image.hxx>
#include <svtools/ivctrl.hxx>
#include <svl/itempool.hxx>
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 290243d..129062b 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -30,15 +30,9 @@
// include ---------------------------------------------------------------
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/valueset.hxx>
#include <sfx2/tabdlg.hxx>
class SdrView;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index d5b45da..155346a 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -28,9 +28,7 @@
#ifndef _LINKDLG_HXX
#define _LINKDLG_HXX
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 3d80608..553fc46 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <svl/macitem.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <rtl/ustring.hxx>
#include <hash_map>
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 5ec7dc6..7420895 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -31,9 +31,7 @@
#include <vcl/dialog.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include "radiobtnbox.hxx"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 9c38f89..d22b1bc 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -36,9 +36,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
-#ifndef _SVX_NUMDEF_HXX
#include <editeng/numdef.hxx>
-#endif
#include <svtools/ctrlbox.hxx>
#include <svl/svarray.hxx>
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index a721865..d599578 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -29,9 +29,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/edit.hxx>
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index bfd8a8c..7acf7f4 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -32,9 +32,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/combobox.hxx>
#include <vcl/timer.hxx>
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 5cc39a9..6468790 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -30,12 +30,8 @@
// include ---------------------------------------------------------------
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#ifdef _SVX_OPTPATH_CXX
#include <svtools/headbar.hxx>
@@ -44,9 +40,7 @@ class HeaderBar;
#endif
#include "ControlFocusHelper.hxx"
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
#include <svtools/dialogclosedlistener.hxx>
// forward ---------------------------------------------------------------
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 3dc14bc..bc905b0 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -28,9 +28,7 @@
#ifndef _PASTEDLG_HXX
#define _PASTEDLG_HXX
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <sot/formats.hxx>
#include <tools/globname.hxx>
#include <svtools/transfer.hxx>
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index fdb9966..f92ba77 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -29,15 +29,9 @@
// include ---------------------------------------------------------------
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <sfx2/basedlgs.hxx>
#include <svtools/svmedit.hxx>
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index b262d76..15c5ee2 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -32,9 +32,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index bd1b795..f7b2157 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -31,13 +31,9 @@
#include <svx/dlgctrl.hxx>
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
class SdrView;
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index f677f4d..a2af2d5 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -31,9 +31,7 @@
#include <svx/dlgctrl.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
// #i75273#
#include <basegfx/range/b2drange.hxx>
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index d47c234..cb0c5f6 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -31,9 +31,7 @@
#include <layout/layout.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
@@ -43,9 +41,7 @@
#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002)
#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004)
*/
-#ifndef _SVX_ZOOM_HXX
#include "zoom_def.hxx"
-#endif
// class SvxZoomDialog ---------------------------------------------------
/*
{k:\svx\prototyp\dialog\zoom.bmp}
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 8cdad6a..4a1c85e 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -31,9 +31,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/inettbc.hxx>
#include <svtools/urlcontrol.hxx>
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 76709aa..324d2d9 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -36,9 +36,7 @@
// header for ColorLB
#include <svx/dlgctrl.hxx>
// header for PushButton
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
// header for XColorTable
#include <svx/xtable.hxx>
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 6e97f5f..c43b9ff 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -27,9 +27,7 @@
#ifndef _SVX_OPTCTL_HXX
#define _SVX_OPTCTL_HXX
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 8014281..994a4b2 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -27,12 +27,8 @@
#ifndef _OFA_OPTFLTR_HXX
#define _OFA_OPTFLTR_HXX
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/simptabl.hxx>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
old mode 100755
new mode 100644
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 47deff1..3536002 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -29,9 +29,7 @@
#define _SVX_OPTJSEARCH_HXX_
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
class Window;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 8a14147..7674b1e 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -31,9 +31,7 @@
// include ---------------------------------------------------------------
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <com/sun/star/container/XNameReplace.hpp>
// class SvxPathTabPage --------------------------------------------------
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
old mode 100755
new mode 100644
index bc1bd60..a1dbf98
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -40,9 +40,7 @@
#include <hash_map>
#include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
#include <com/sun/star/uno/SEQUENCE.h>
-#endif
#include "embeddocaccess.hxx"
#include "docholder.hxx"
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
old mode 100755
new mode 100644
index de7e9c8..d2c03b7
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -37,9 +37,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/XInterface.hpp>
-#ifndef __COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
#include <com/sun/star/lang/XTypeProvider.hpp>
-#endif
#include <cppuhelper/weak.hxx>
diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx
index bb4f269..4c4a576 100644
--- a/extensions/inc/appsettings.hxx
+++ b/extensions/inc/appsettings.hxx
@@ -27,9 +27,7 @@
#ifndef _APPSETTINGS_HXX
#define _APPSETTINGS_HXX
-#ifndef __STARDIV_UNO_UTIL_CONTAINR_HXX__
#include <stardiv/uno/util/containr.hxx>
-#endif
#ifdef __cplusplus
extern "C" {
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 8936233..a2c58bd 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -30,9 +30,7 @@
#include <svtools/wizardmachine.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef EXTENSIONS_ABPRESID_HRC
#include "abpresid.hrc"
-#endif
#include "componentmodule.hxx"
#include <vcl/fixed.hxx>
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 986e22b..a2ecf3e 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -34,9 +34,7 @@
#include <com/sun/star/sdbc/XRowSetListener.hpp>
#include <svtools/stdctrl.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <vcl/group.hxx>
#include <svtools/svmedit.hxx>
#include <vcl/tabpage.hxx>
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 625f1bd..77d65f4 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -35,15 +35,11 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include "dbptypes.hxx"
-#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
#include "dbpresid.hrc"
-#endif
#include "componentmodule.hxx"
#include "wizardcontext.hxx"
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 1dd75b3..6ed2932 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -29,9 +29,7 @@
#define _SERVPROV_HXX
#include <com/sun/star/lang/XInitialization.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
#include "ole2uno.hxx"
#include "unoconversionutilities.hxx"
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index 6627a39..4db1f21 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <svtools/wizdlg.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/tabpage.hxx>
#include <vcl/fixed.hxx>
#include <svtools/svmedit.hxx>
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index bd2aa9a..13729f6 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/inspection/XPropertyControl.hpp>
/** === end UNO includes === **/
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement
{
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index d9834fc..30c726f 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -29,9 +29,7 @@
#define _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_
#include "browserline.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
#include "modulepcr.hxx"
-#endif
#include "pcrcommon.hxx"
/** === begin UNO includes === **/
@@ -40,9 +38,7 @@
/** === end UNO includes === **/
#include <vcl/scrbar.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <tools/link.hxx>
#include <rtl/ref.hxx>
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 61aa030..4fb7c85 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -30,9 +30,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
/** === begin UNO includes === **/
#include <com/sun/star/form/XForm.hpp>
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index e5413f2..76ff9f5 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -29,9 +29,7 @@
#define _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_
#include "propertyinfo.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
#include "modulepcr.hxx"
-#endif
#include "enumrepresentation.hxx"
#include <comphelper/composedprops.hxx>
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index 239ed32..6e9871c 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -30,9 +30,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
/** === begin UNO includes === **/
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 207f9e4..c38e1e2 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -33,9 +33,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <set>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index cfc508f..4a79eaa 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -34,9 +34,7 @@
#include "proplinelistener.hxx"
#include "propcontrolobserver.hxx"
#include "browserview.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_
#include "modulepcr.hxx"
-#endif
#include "propertyinfo.hxx"
#include "pcrcomponentcontext.hxx"
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 89450f4..eb8cc78 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -30,9 +30,7 @@
#include "pcrcomponentcontext.hxx"
#include "pcrcommon.hxx"
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_
#include "modulepcr.hxx"
-#endif
/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 95950e0..1bbe822 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -30,15 +30,11 @@
#include <vcl/fixed.hxx>
#include <svtools/svtreebx.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/image.hxx>
#include <vcl/dialog.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
#include "modulepcr.hxx"
-#endif
//............................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 57d40da..24f6ac5 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -33,22 +33,14 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _TOOLS_LIST_HXX
#include <tools/list.hxx>
-#endif
#include <comphelper/uno3.hxx>
//............................................................................
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 6a9b156..3fc3c2d 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -28,9 +28,7 @@
#define _EXTENSIONS_SCANNER_GRID_HXX
#include <vcl/window.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/dialog.hxx>
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 78a2f1c..ad17903 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -30,9 +30,7 @@
#include <vcl/dialog.hxx>
#include <tools/config.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/field.hxx>
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index a1179e6..84ac250 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -30,21 +30,15 @@
#include <tools/stream.hxx>
#include <vos/mutex.hxx>
-#ifndef __RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weak.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
-#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP
#include <com/sun/star/awt/XBitmap.hpp>
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#ifndef __COM_SUN_STAR_LANG_EVENTOBJECT_HPP
#include <com/sun/star/lang/EventObject.hpp>
-#endif
#include <com/sun/star/scanner/XScannerManager.hpp>
#include <com/sun/star/scanner/ScannerException.hpp>
diff --git a/extensions/source/svg/svgcom.hxx b/extensions/source/svg/svgcom.hxx
index fbac124..df17623 100644
--- a/extensions/source/svg/svgcom.hxx
+++ b/extensions/source/svg/svgcom.hxx
@@ -29,23 +29,15 @@
#define _SVGCOM_HXX
#include <cppuhelper/weak.hxx>
-#ifndef __RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <tools/stack.hxx>
-#ifndef _SALBTYPE_HXX
#include <vcl/salbtype.hxx>
-#endif
-#ifndef _GDIMTF_HXX
#include <vcl/gdimtf.hxx>
-#endif
-#ifndef _METAACT_HXX
#include <vcl/metaact.hxx>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index a2428a8..7e581d9 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -31,9 +31,7 @@
#include "boost/utility.hpp"
#include <osl/mutex.hxx>
#include "com/sun/star/uno/Any.h"
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include "com/sun/star/uno/Reference.h"
-#endif
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/awt/Rectangle.hpp"
#include "com/sun/star/awt/XActionListener.hpp"
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index f6d8383..0e6b050 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -29,9 +29,7 @@
#define _XMXCOM_HXX
#include <cppuhelper/weak.hxx>
-#ifndef __RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 9d452c2..2f34b63 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -70,9 +70,7 @@
#include <connectivity/filtermanager.hxx>
#include <connectivity/warningscontainer.hxx>
-#ifndef FORMS_SOURCE_MISC_LISTENERCONTAINERS_HXX
#include "listenercontainers.hxx"
-#endif
#include "ids.hxx"
#include <comphelper/propmultiplex.hxx>
#include <comphelper/uno3.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 6b00676..83372c9 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -29,9 +29,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/toolbox.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include "rtattributes.hxx"
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 08a60ff..eba878e 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -33,9 +33,7 @@
#include <com/sun/star/packages/WrongPasswordException.hpp>
#include <ByteGrabber.hxx>
#include <HashMaps.hxx>
-#ifndef _INFLATER_HXX
#include <Inflater.hxx>
-#endif
#include <mutexholder.hxx>
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 012d27a..ae41285 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -28,14 +28,10 @@
#define _ZIP_OUTPUT_STREAM_HXX
#include <ByteChucker.hxx>
-#ifndef _DEFLATER_HXX
#include <Deflater.hxx>
-#endif
#include <CRC32.hxx>
#include <rtl/cipher.h>
-#ifndef RTL_DIGEST_H_
#include <rtl/digest.h>
-#endif
#include <vector>
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index b058229..067ae94 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <HashMaps.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <osl/file.h>
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 23e0c5a..5c38bd3 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
#include <cppuhelper/implbase3.hxx>
-#endif
class ZipPackage;
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 786c039..4c97215 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -29,9 +29,7 @@
#define _MANIFEST_IMPORT_HXX
#include <cppuhelper/implbase1.hxx> // helper for implementations
-#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
#include <vector>
#include <HashMaps.hxx>
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index e76b111..907fd04 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -29,12 +29,8 @@
#define _MANIFEST_READER_HXX
#include <cppuhelper/implbase2.hxx>
-#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTREADER_HPP
#include <com/sun/star/packages/manifest/XManifestReader.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 936d85b..6757dc0 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -29,12 +29,8 @@
#define _MANIFEST_WRITER_HXX
#include <cppuhelper/implbase2.hxx>
-#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTWRITER_HPP
#include <com/sun/star/packages/manifest/XManifestWriter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
diff --git a/package/source/zipapi/EntryInputStream.hxx b/package/source/zipapi/EntryInputStream.hxx
index a2cccf4..4696d5e 100644
--- a/package/source/zipapi/EntryInputStream.hxx
+++ b/package/source/zipapi/EntryInputStream.hxx
@@ -32,12 +32,8 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <Inflater.hxx>
#include <com/sun/star/packages/zip/ZipEntry.hpp>
-#ifndef _VOS_REF_H_
#include <vos/ref.hxx>
-#endif
-#ifndef _ENCRYPTION_DATA_HXX
#include <EncryptionData.hxx>
-#endif
class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream,
com::sun::star::io::XSeekable >
{
diff --git a/package/source/zipapi/XFileStream.hxx b/package/source/zipapi/XFileStream.hxx
index 93ed845..9c14758 100644
--- a/package/source/zipapi/XFileStream.hxx
+++ b/package/source/zipapi/XFileStream.hxx
@@ -31,12 +31,8 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/implbase2.hxx>
-#ifndef _VOS_REF_H_
#include <vos/ref.hxx>
-#endif
-#ifndef _INFLATER_HXX
#include <Inflater.hxx>
-#endif
#include <ZipEntry.hxx>
namespace com { namespace sun { namespace star {
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index bfab0b8..1a30ac8 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -28,9 +28,7 @@
#define _CONTENT_INFO_HXX_
#include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEl_HPP_
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#endif
#include <ZipPackageFolder.hxx>
#include <ZipPackageStream.hxx>
diff --git a/package/source/zippackage/ZipPackageEntry.hxx b/package/source/zippackage/ZipPackageEntry.hxx
index 41fb226..b10e87f 100644
--- a/package/source/zippackage/ZipPackageEntry.hxx
+++ b/package/source/zippackage/ZipPackageEntry.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <ZipEntry.hxx>
#include <cppuhelper/implbase5.hxx>
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index cc50d08..751aa18 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -29,12 +29,8 @@
#include <cppuhelper/implbase2.hxx> // helper for implementations
#include <com/sun/star/container/XEnumeration.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _HASH_MAPS_HXX
#include <HashMaps.hxx>
-#endif
class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2
<
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index e6d3494..ffe6d6c 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -31,13 +31,9 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/packages/XDataSinkEncrSupport.hpp>
#include <ZipPackageEntry.hxx>
-#ifndef _VOS_REF_H_
#include <vos/ref.hxx>
-#endif
#include <EncryptionData.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
#include <cppuhelper/implbase2.hxx>
-#endif
#include <mutexholder.hxx>
#define PACKAGE_STREAM_NOTSET 0
diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.hxx b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
index 75f8a35..3a98b9b 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/register.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
@@ -28,9 +28,7 @@
#ifndef _REGISTER_HXX_
#define _REGISTER_HXX_
-#ifndef _CONSTANTS_HXX_
#include "constants.hxx"
-#endif
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
index 90d90db..0c5cc1f 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
@@ -8,9 +8,7 @@
#include "registry.hxx"
#include "registrationcontextinformation.hxx"
-#ifndef _CONSTANTS_HXX_
#include "constants.hxx"
-#endif
class Registrar
{
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index 7d8d4b5..01dc316 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -31,9 +31,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include "com/sun/star/uno/Sequence.h"
rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 8a507eb..9870dcd 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -34,13 +34,9 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifndef _XCERTIFICATECONTAINER_HPP_
#include <com/sun/star/security/XCertificateContainer.hpp>
-#endif
-#ifndef _CERTIFICATECONTAINERSTATUS_HPP_
#include <com/sun/star/security/CertificateContainerStatus.hpp>
-#endif
#include <vector>
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index 65c8ed2..369f396 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.hpp>
#include <com/sun/star/xml/crypto/sax/XEncryptionResultListener.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_SAX_XSIGNATURECOLLECTOR_HPP_
#include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
-#endif
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx
index 077fe71..36307e3 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_SAX_XSIGNATURECOLLECTOR_HPP_
#include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
-#endif
#include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp>
#include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index 18d1b85..8b7ee93 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index 8ac4145..fa7afb1 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
diff --git a/xmlsecurity/source/xmlsec/errorcallback.hxx b/xmlsecurity/source/xmlsec/errorcallback.hxx
index cd065c1..9965fa5 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.hxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.hxx
@@ -28,9 +28,7 @@
#ifndef _ERRORCALLBACK_XMLSECIMPL_HXX_
#define _ERRORCALLBACK_XMLSECIMPL_HXX_
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 5893840..618c73c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -42,14 +42,10 @@
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/security/XCertificate.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index dc59bc0..d3bf615 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -29,9 +29,7 @@
#define _SEINITIALIZERIMPL_HXX
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_SEINITIALIZER_HPP_
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#endif
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index 7a21b6a..abdee84 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index 96ffded..8ba9777 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index faae589..324cc14 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index afa46f7..2804374 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/security/XCertificate.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index 56d249c..01d5598 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -29,9 +29,7 @@
#define _SEINITIALIZERIMPL_HXX
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#ifndef _COM_SUN_STAR_XML_CRYPTO_SEINITIALIZER_HPP_
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#endif
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 60ec903..c9c7131 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 662683e..a4432e2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index f6abbd8..f0a336c 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -34,14 +34,10 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
index cfcda4a..41b497a 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
@@ -28,9 +28,7 @@
#ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_
#define _XMLSTREAMIO_XMLSECIMPL_HXX_
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_
#include <com/sun/star/uno/Reference.hxx>
-#endif
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
int xmlEnableStreamInputCallbacks( void ) ;
commit afdb74c7ef53628958aa6a9156e11ca2295f9c45
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 4 16:58:18 2010 +0200
remove include guards using fixguard.py
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 9065dd2..6ef5bfb 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -40,9 +40,7 @@
#include <rtl/process.h>
#include <tools/link.hxx>
-#ifndef _SVAPP_HXX
#include <vcl/svapp.hxx>
-#endif
#include <vcl/window.hxx>
#include <vcl/sysdata.hxx>
#include <uno/current_context.hxx>
@@ -51,13 +49,9 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
-#ifndef _JVMACCESS_UNOVIRTUALMACHINE_HXX_
#include "jvmaccess/unovirtualmachine.hxx"
-#endif
-#ifndef _JVMACCESS_VIRTUALMACHINE_HXX_
#include "jvmaccess/virtualmachine.hxx"
-#endif
#include <osl/diagnose.h>
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 6a1f3a1..ae856c6 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX_
#include "accessibility/extended/accessibletablistbox.hxx"
-#endif
#include "accessibility/extended/accessibletablistboxtable.hxx"
#include <svtools/svtabbx.hxx>
#include <comphelper/sequence.hxx>
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index dd1adec..4e815b5 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX_
#include "accessibility/extended/accessibletablistboxtable.hxx"
-#endif
#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
#include "accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx"
#include <svtools/svtabbx.hxx>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index e0e3ebb..62f7a0b 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_accessibility.hxx"
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
#include <accessibility/extended/textwindowaccessibility.hxx>
-#endif
#include "comphelper/accessibleeventnotifier.hxx"
#include "unotools/accessiblerelationsethelper.hxx"
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
old mode 100755
new mode 100644
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index 8f61a52..ff7b579 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -29,9 +29,7 @@
#include "precompiled_accessibility.hxx"
#include <accessibility/helper/accresmgr.hxx>
-#ifndef _TOOLS_SIMPLERESMGR_HXX
#include <tools/simplerm.hxx>
-#endif
#include <vcl/svapp.hxx>
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
index e77959a..5ce78d0 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -29,9 +29,7 @@
#include "precompiled_automation.hxx"
#include <basic/sbx.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <basic/testtool.hxx>
#include "testbasi.hxx"
#define P_FEHLERLISTE TestToolObj::pFehlerListe
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index 016623f..dd467f2 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -30,9 +30,7 @@
#include "editwin.hxx"
#include <tools/stream.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
BOOL GHEditWindow::Close()
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index f0e0a86..979be5e 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -29,9 +29,7 @@
#include "precompiled_automation.hxx"
#include <svtools/filedlg.hxx>
#include <stdio.h>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <tools/debug.hxx>
#include <svtools/testtool.hxx>
#include <svtools/ttprops.hxx>
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 3840855..438bc94 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -33,9 +33,7 @@
#include "retstrm.hxx"
#include <basic/svtmsg.hrc>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx
index 11fe303..afd80fc 100644
--- a/automation/source/server/profiler.cxx
+++ b/automation/source/server/profiler.cxx
@@ -33,9 +33,7 @@
#include <tools/string.hxx>
#include <unotools/localedatawrapper.hxx>
#include <vcl/svapp.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "profiler.hxx"
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index f167404..bc6fa21 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -41,9 +41,7 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <tools/stream.hxx>
#include <tools/config.hxx>
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index fb7d978..7f0f903 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -30,14 +30,10 @@
#include <tools/time.hxx>
#include <vcl/splitwin.hxx>
#include <vcl/wrkwin.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "statemnt.hxx"
-#ifndef _RETSRTM_HXX
#include "retstrm.hxx"
-#endif
#include "rcontrol.hxx"
#if OSL_DEBUG_LEVEL > 1
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 40bdedb..ffca7b3 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -35,39 +35,19 @@
#include <comphelper/uieventslogger.hxx>
#include <vcl/wintypes.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/menubtn.hxx>
#include <svtools/svtreebx.hxx>
#include <svtools/brwbox.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _DOCKWIN_HXX //autogen
#include <vcl/dockwin.hxx>
-#endif
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/menu.hxx>
@@ -93,9 +73,7 @@
#include <tools/fsys.hxx>
#include <svl/stritem.hxx>
#include <svtools/ttprops.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include <basic/dispdefs.hxx>
#include <basic/sbuno.hxx>
#include <vos/socket.hxx>
@@ -107,9 +85,7 @@
#include "statemnt.hxx"
#include "scmdstrm.hxx"
-#ifndef _RETSRTM_HXX
#include "retstrm.hxx"
-#endif
#if OSL_DEBUG_LEVEL > 1
#include "editwin.hxx"
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 755ca1f..9078f56 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#ifndef _KEYCOD_HXX //autogen
#include <vcl/keycod.hxx>
-#endif
#include <basic/sbx.hxx>
#include <tools/stream.hxx>
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index b2c8031..3952c42 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -32,14 +32,10 @@
#include <tools/errcode.hxx>
#include <basic/sbxobj.hxx>
#include <basic/sbx.hxx>
-#ifndef __SBX_SBXVARIABLE_HXX //autogen
#include <basic/sbxvar.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <automation/communi.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
// Der CommunicationManager hat folgende Elemente:
// 1) Properties:
diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx
index 9be7049..4da0bc8 100644
--- a/automation/source/testtool/cretstrm.cxx
+++ b/automation/source/testtool/cretstrm.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#ifndef _CRetStream_HXX
#include "cretstrm.hxx"
-#endif
#include <tools/debug.hxx>
#include "rcontrol.hxx"
#include "svcommstream.hxx"
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index bdba92d..47eaaee 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -30,34 +30,23 @@
#ifdef OS2
#define INCL_DOS
-#ifndef _SVPM_H
#include <svpm.h>
-#endif
-#endif
#include "sysdir_win.hxx"
#include "registry_win.hxx"
#include "sttresid.hxx"
#include <osl/file.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _SOUND_HXX //autogen
#include <vcl/sound.hxx>
-#endif
#include <tools/config.hxx>
-#ifndef _APP_HXX //autogen
#include <vcl/svapp.hxx>
-#endif
#include <svtools/stringtransfer.hxx>
#include <svl/brdcst.hxx>
//#ifndef _SBXCLASS_HXX //autogen
#include <basic/sbx.hxx>
//#endif
#include <com/sun/star/uno/Any.hxx>
-#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HXX_
#include <com/sun/star/frame/XDesktop.hpp>
-#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/bridge/XBridgeFactory.hpp>
#include <com/sun/star/connection/XConnector.hpp>
@@ -86,9 +75,7 @@ using namespace rtl;
#include <basic/sbuno.hxx>
#include <basic/basicrt.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "tcommuni.hxx"
#include "comm_bas.hxx"
#include <cretstrm.hxx>
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index ca39257..a0cedae 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -35,9 +35,7 @@
#include <tools/debug.hxx>
#include <vcl/timer.hxx>
-#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
-#endif
#include "rcontrol.hxx"
#include "tcommuni.hxx"
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index b9e823b..2bcc97b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -42,9 +42,7 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 255571f..56f80f3 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -58,9 +58,7 @@
#include <unotools/sourceviewconfig.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <comphelper/processfactory.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index e307720..fc7038c 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -68,9 +68,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <svtools/ehdl.hxx>
#include <svtools/langtab.hxx>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index d8417a6..5b1bf65 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-#ifndef _BASCTL_BASIDECTRLR_HXX_
#include <basidectrlr.hxx>
-#endif
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 933a30c..37c6045 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -51,9 +51,7 @@
#include "dlged.hxx"
#include <dlgeddef.hxx>
#include <comphelper/processfactory.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_
#include <com/sun/star/script/XLibraryContainer.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 88586d9..933abb0 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -49,13 +49,9 @@
#include <sbxitem.hxx>
#include <iderdll.hxx>
-#ifndef _PASSWD_HXX //autogen
#include <sfx2/passwd.hxx>
-#endif
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/script/ModuleType.hpp>
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 8073b48..320f2fb 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -52,9 +52,7 @@
#include <sbxitem.hxx>
#include <sfx2/minfitem.hxx>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/document/MacroExecMode.hpp>
using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 312dee4..8bb4433 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -60,9 +60,7 @@
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/script/XLibraryContainerExport.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index e2a2377..3203d86 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -44,12 +44,8 @@
#include <sbxitem.hxx>
#include <iderdll.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
-#endif
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/resource/XStringResourceManager.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index d3ed4b7..e93a29c 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -32,9 +32,7 @@
#include <basic/sbx.hxx>
-#ifndef _SV_CMDEVT_HXX
#include <vcl/cmdevt.hxx>
-#endif
#include <vcl/taskpanelist.hxx>
#include <vcl/sound.hxx>
#include <objdlg.hrc>
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 04bc7e5..27e119a 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -46,9 +46,7 @@
#include <svl/itempool.hxx>
#include <sfx2/viewfrm.hxx>
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <svx/svdpagv.hxx>
#include <xmlscript/xml_helper.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 50b54c6..92cbef8 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -40,9 +40,7 @@
#include <iderid.hxx>
#include <localizationmgr.hxx>
-#ifndef _BASCTL_DLGRESID_HRC
#include <dlgresid.hrc>
-#endif
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
#include <unotools/sharedunocomponent.hxx>
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index 505e7f6..82d6687 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -33,9 +33,7 @@
#include "dlged.hxx"
#include <dlgedpage.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <sfx2/viewfrm.hxx>
#include <basidesh.hxx>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index b5ac567..cc93f81 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -39,9 +39,7 @@
#include "dlgresid.hrc"
#include "helpid.hrc"
-#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
#include <com/sun/star/i18n/XBreakIterator.hpp>
-#endif
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/resource/XStringResourceManager.hpp>
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 6a1d5e4..d24c8ac 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -35,18 +35,14 @@
#include "basidesh.hxx"
#include <iderid.hxx>
-#ifndef _BASCTL_DLGRESID_HRC
#include <dlgresid.hrc>
-#endif
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/bindings.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/objitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <tools/shl.hxx>
#include <vcl/stdtext.hxx>
#include <svx/svdview.hxx>
@@ -55,9 +51,7 @@
#include <svx/svditer.hxx>
#include <sfx2/viewsh.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
-#endif
#include <comphelper/property.hxx>
#include <comphelper/composedprops.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
old mode 100755
new mode 100644
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 43499f9..ee8d419 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -58,9 +58,7 @@
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e835430..171f8f4 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -31,12 +31,8 @@
#include <stdlib.h>
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list