diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 16:58:18 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:08:01 +0200 |
| commit | afdb74c7ef53628958aa6a9156e11ca2295f9c45 (patch) | |
| tree | 6d3e5840b92580e3e6cf650f6fdccb7c8fd433fa | |
| parent | 97a79787ef39e47fa0a9a223c472961291799291 (diff) | |
remove include guards using fixguard.py
153 files changed, 0 insertions, 414 deletions
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx index 9065dd241..6ef5bfb3e 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 index fe639bd39..fe639bd39 100755..100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 36dce4076..36dce4076 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 22358d7b8..22358d7b8 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 48f885213..48f885213 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index d743475be..d743475be 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 83039718b..83039718b 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 792b7df1f..792b7df1f 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index 5e25d91fc..5e25d91fc 100755..100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 6a1f3a117..ae856c6db 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 dd1adec3e..4e815b5a6 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 e0e3ebb2d..62f7a0b05 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 index df71877f1..df71877f1 100755..100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 8f61a5246..ff7b579db 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 e77959ab0..5ce78d019 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 016623fe9..dd467f2e7 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 f0e0a86aa..979be5e83 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 38408558f..438bc9414 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 11fe30357..afd80fc03 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 f167404d0..bc6fa21c5 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 fb7d978fc..7f0f903b0 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 40bdedbac..ffca7b356 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 755ca1fac..9078f5605 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 b2c803172..3952c42b9 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 9be70498c..4da0bc8de 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 bdba92d02..47eaaee28 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 ca3925786..a0cedae19 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 b9e823b64..2bcc97b5d 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 255571f1c..56f80f34b 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 e307720fd..fc7038c55 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 d8417a613..5b1bf6550 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 933a30cf5..37c6045d1 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 88586d950..933abb09a 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 8073b48d1..320f2fb56 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 312dee4c2..8bb443364 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 e2a2377e5..3203d8603 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 d3ed4b768..e93a29c2b 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 04bc7e580..27e119a32 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 50b54c66d..92cbef878 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 505e7f680..82d668717 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 b5ac567a2..cc93f8154 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 6a1d5e4e2..d24c8acec 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 index 7c6faf4f3..7c6faf4f3 100755..100644 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 43499f9f3..ee8d4195a 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 e835430aa..171f8f44c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -31,12 +31,8 @@ #include <stdlib.h> #include <time.h> -#ifndef _HELP_HXX //autogen #include <vcl/help.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/decoview.hxx> #include <vcl/toolbox.hxx> #include <vcl/scrbar.hxx> @@ -71,9 +67,7 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#ifndef _UNOTOOLS_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> -#endif #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> @@ -86,9 +80,7 @@ #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIElement.hpp> -#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_ #include <com/sun/star/ui/UIElementType.hpp> -#endif #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 22ea4611a..22ea4611a 100755..100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 68c93e526..68c93e526 100755..100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index c5a371f97..c5a371f97 100755..100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c069e973d..c069e973d 100755..100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 7a5a3a7b0..7a5a3a7b0 100755..100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index f18439b3d..f18439b3d 100755..100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6144bb40a..6144bb40a 100755..100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 09d26a567..439118b9d 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -40,9 +40,7 @@ #include <Windows.h> #include <com/sun/star/lang/SystemDependent.hpp> #include <com/sun/star/awt/XSystemChildFactory.hpp> -#ifndef _COM_SUN_STAR_AWT_XSYSTEMDEPENDENTWINDOWPERR_HPP_ #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> -#endif #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> @@ -51,9 +49,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseAble.hpp> -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XDesktop.hpp> diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index 0fa9cee12..0fa9cee12 100755..100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index b10af6a61..b10af6a61 100755..100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index a13de0151..a13de0151 100755..100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index a56882d24..a56882d24 100755..100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx index 9ddd8f060..9ddd8f060 100755..100644 --- a/embedserv/source/embed/guid.cxx +++ b/embedserv/source/embed/guid.cxx diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index d0cacf2e9..d0cacf2e9 100755..100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 491343e3a..491343e3a 100755..100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 6505ae76c..7891406a3 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -35,9 +35,7 @@ #include <unotools/ucbhelper.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/pathoptions.hxx> -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif #include <sfx2/docfilt.hxx> #include <vcl/msgbox.hxx> #include <comphelper/componentcontext.hxx> diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 9340e37bb..ee8b08184 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -33,12 +33,8 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <vcl/stdtext.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <vcl/waitobj.hxx> diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index f01af1e7c..b217b5637 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -35,14 +35,10 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <tools/debug.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/stdtext.hxx> #include <com/sun/star/util/AliasProgrammaticPair.hpp> -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <unotools/confignode.hxx> diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index baac1f81d..1fe2274c1 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -43,9 +43,7 @@ #include "toolbar.hrc" #include "bibresid.hxx" #include "datman.hxx" -#ifndef BIBTOOLS_HXX #include "bibtools.hxx" -#endif using namespace rtl; using namespace ::com::sun::star; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 0b57c4bd4..339548e92 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -36,9 +36,7 @@ #include <svl/itemprop.hxx> #include <uno/environment.h> #include <svl/urihelper.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/sdbc/ResultSetType.hpp> @@ -65,9 +63,7 @@ #include <svtools/svmedit.hxx> #include "bibresid.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "bibcont.hxx" #include "bibbeam.hxx" #include "bibmod.hxx" diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index c303e2eb4..067d74680 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "bibcont.hxx" #include "bibbeam.hxx" #include "bibmod.hxx" diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 52575a6f3..3d5d6ea5e 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -62,9 +62,7 @@ #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 0653ea7b3..d538276ce 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <datman.hxx> #include <tools/debug.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> #include <vcl/svapp.hxx> @@ -47,9 +45,7 @@ #include "toolbar.hrc" #include "bibresid.hxx" -#ifndef BIBTOOLS_HXX #include "bibtools.hxx" -#endif #include <vos/mutex.hxx> using namespace ::rtl; diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index abaa2c164..b1f206edb 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -36,9 +36,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/byteseq.h> -#ifndef INCLUDED_RTL_INSTANCE_HXX_ #include <rtl/instance.hxx> -#endif #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/Optional.hpp> #include <osl/security.hxx> diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 343ec9a5e..30083c035 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "commonpagesdbp.hxx" -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif #include "componentmodule.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> @@ -49,9 +47,7 @@ #include <sfx2/docfilt.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif //......................................................................... namespace dbp { diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index b0cbd6a47..984a3eb80 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_DBP_WIZARDSERVICES_HXX_ #include "wizardservices.hxx" -#endif #include "unoautopilot.hxx" #include "groupboxwiz.hxx" #include "listcombowizard.hxx" diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index cbcb0cec1..75f8d2559 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -27,9 +27,7 @@ #include "componentmodule.hxx" #include <tools/resmgr.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <comphelper/sequence.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index ea1660878..1d3b5e473 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -33,18 +33,10 @@ #include <string> /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XCsvLogFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XLogFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif /** === end UNO includes === **/ #include <comphelper/componentcontext.hxx> diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 78c2a0571..f930aa522 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef EXTENSIONS_LOGHANDLER_HXX #include "loghandler.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/logging/LogLevel.hpp> diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 7a73ed7e6..7a73ed7e6 100755..100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index a50fba278..b432e8021 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -35,9 +35,7 @@ #include <plugin/impl.hxx> -#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAGS_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> -#endif #include <com/sun/star/frame/XComponentLoader.hpp> #include <tools/fsys.hxx> #include <tools/urlobj.hxx> diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx index 1c4ee7920..5cdcb46c0 100644 --- a/extensions/source/preload/oemwiz.cxx +++ b/extensions/source/preload/oemwiz.cxx @@ -35,12 +35,8 @@ #include <svl/itempool.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> -#ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_ #include "preload.hrc" -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <svtools/xtextedt.hxx> #include "osl/diagnose.h" diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index bee29a21e..3fd774187 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "browserlistbox.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "linedescriptor.hxx" diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index bebb88753..7a8596235 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_ #include "controlfontdialog.hxx" -#endif #include <cppuhelper/typeprovider.hxx> #include "fontdialog.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 2fab07761..17c3df504 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -29,15 +29,9 @@ #include "precompiled_extensions.hxx" #include "defaultforminspection.hxx" #include "pcrcommon.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "propctrlr.hrc" #include "formmetadata.hxx" diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index a57ccebcc..a2c481ebc 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -29,12 +29,8 @@ #include "precompiled_extensions.hxx" #include "eformshelper.hxx" #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "propeventtranslation.hxx" #include "formbrowsertools.hxx" diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index f670c441e..2c72f795d 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -29,19 +29,11 @@ #include "precompiled_extensions.hxx" #include <sfx2/sfxsids.hrc> #include "fontdialog.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/types.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -52,9 +44,7 @@ #include "formstrings.hxx" #include "fontitemids.hxx" #include <editeng/charreliefitem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> @@ -72,9 +62,7 @@ #include <svtools/ctrltool.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index 16cdcf7be..1ac9446d1 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -31,12 +31,8 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include <tools/string.hxx> #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 2fd98079c..16d27d41c 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -31,9 +31,7 @@ #include "pcrcommon.hxx" #include "formstrings.hxx" #include "defaultforminspection.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #include "propctrlr.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 9b4e52517..3911f58f7 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -31,12 +31,8 @@ #include "formlinkdialog.hxx" #include "formlinkdialog.hrc" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <vcl/combobox.hxx> #include <vcl/msgbox.hxx> diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f6ab37e3f..6234e2bab 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "formmetadata.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #include "propctrlr.hrc" -#endif #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propctrlr.hrc" #include <svtools/localresaccess.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 4913626d0..58c5419c3 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -28,14 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "handlerhelper.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif #include "formresid.hrc" #include <comphelper/extract.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "enumrepresentation.hxx" #include "formmetadata.hxx" #include "pcrcomponentcontext.hxx" diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index a0de09d7b..4dd6b529b 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -28,9 +28,7 @@ #include "precompiled_extensions.hxx" #include "inspectorhelpwindow.hxx" #include "modulepcr.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 3297b5f5d..68c4656ea 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -28,16 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "listselectiondlg.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC #include "listselectiondlg.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <vcl/msgbox.hxx> diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx index 3b71c70e5..8d3b10cf3 100644 --- a/extensions/source/propctrlr/modulepcr.cxx +++ b/extensions/source/propctrlr/modulepcr.cxx @@ -29,12 +29,8 @@ #include "precompiled_extensions.hxx" #include "modulepcr.hxx" -#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H #include <rtl/instance.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/getglobalmutex.hxx> -#endif //........................................................................ namespace pcr diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index a7cbecd2a..2aa0c9b8b 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -28,16 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "newdatatype.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HRC #include "newdatatype.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 8949e9b40..6b5d17d4e 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "pcrcommon.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/util/MeasureUnit.hpp> diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 51d6cc9b8..f00c1c0fa 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif //--------------------------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 26f0da8df..218f7aaed 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -31,16 +31,10 @@ #include "pcrstrings.hxx" #include "standardcontrol.hxx" #include "linedescriptor.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propertyeditor.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "formstrings.hxx" #include "formmetadata.hxx" #include "formbrowsertools.hxx" @@ -57,9 +51,7 @@ #include <comphelper/types.hxx> #include <comphelper/extract.hxx> #include <toolkit/awt/vclxwindow.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/property.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index 9fc54b882..d618629b1 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX #include "propertycontrolextender.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/awt/KeyFunction.hpp> diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index c81e59f0b..f2f3af7ba 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "selectlabeldialog.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_FORMRESID_HRC_ #include "formresid.hrc" -#endif #include "formbrowsertools.hxx" #include "formstrings.hxx" #include <com/sun/star/form/FormComponentType.hpp> diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 96ea323e9..9d9e0d4b0 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -29,12 +29,8 @@ #include "precompiled_extensions.hxx" #include "sqlcommanddesign.hxx" #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "unourl.hxx" /** === begin UNO includes === **/ diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 291bfab33..4ea2c156d 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -43,9 +43,7 @@ //================================================================== // ugly dependencies for the OColorControl -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/drawitem.hxx> #include <xtable.hxx> //================================================================== @@ -55,9 +53,7 @@ #include <unotools/syslocale.hxx> #include <unotools/datetime.hxx> #include <i18npool/mslangid.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/svapp.hxx> //================================================================== diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index d11fe50e9..8e7873b0b 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -43,19 +43,13 @@ #include <com/sun/star/util/Time.hpp> #include <comphelper/sequence.hxx> #include <connectivity/dbconversion.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include <tools/debug.hxx> #include <tools/string.hxx> #include <tools/StringListResource.hxx> #include <comphelper/types.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif #include <functional> #include <algorithm> diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index adc912434..ed4382943 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -28,16 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "taborder.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HRC #include "taborder.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <comphelper/types.hxx> #include <comphelper/property.hxx> diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index c4ff5dd4b..c4ff5dd4b 100755..100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 47eecc512..47eecc512 100755..100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 987e5fce6..92682624d 100755..100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _COM_SUN_STAR_CONTAINER_CHANGESEVENT_HPP_ #include <com/sun/star/beans/XPropertyState.hpp> -#endif #include <osl/security.hxx> #include <osl/time.h> diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 83d982986..0a90d5f76 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -32,9 +32,7 @@ #include "updateprotocol.hxx" #include "updatecheckconfig.hxx" -#ifndef _COM_SUN_STAR_DEPLOYMENT_UPDATEINFORMATINENTRY_HPP_ #include <com/sun/star/deployment/UpdateInformationEntry.hpp> -#endif #include <com/sun/star/deployment/XPackageInformationProvider.hpp> diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index 7981f0b7c..54fae184c 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -34,9 +34,7 @@ #endif #include <vos/macros.hxx> -#ifndef _USR_SMARTSERVICES_HXX_ #include <usr/smartservices.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index e283cc698..7b9765321 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "CheckBox.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 1c5de4df8..a9c65cc7a 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "Columns.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "property.hxx" #include "componenttools.hxx" #include "ids.hxx" @@ -47,9 +45,7 @@ #include <comphelper/property.hxx> #include <comphelper/basicio.hxx> #include "services.hxx" -#ifndef _FRM_RESOURCE_HRC_ #include "frm_resource.hrc" -#endif #include <tools/debug.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index c4a56e34f..5eb869fd0 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -29,17 +29,13 @@ #include "precompiled_forms.hxx" #include "EditBase.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/basicio.hxx> #include <cppuhelper/queryinterface.hxx> #include "frm_resource.hxx" -#ifndef _FRM_RESOURCE_HRC_ #include "frm_resource.hrc" -#endif //......................................................................... namespace frm diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 595c71e62..c3e39f88c 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/form/FormComponentType.hpp> -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/container.hxx> diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 5b2d4a2b1..47992631d 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -31,9 +31,7 @@ #include "FixedText.hxx" #include "services.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "property.hxx" #include <tools/debug.hxx> diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 833b8ae2f..17f539c63 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "GroupBox.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 70555a97e..8f19e5f0a 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "Hidden.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index c6601f01a..a3d93de49 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "RadioButton.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/extract.hxx> diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index aecff9ed1..b10d6e920 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "formcontrolfont.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "property.hxx" #include <tools/debug.hxx> #include <comphelper/property.hxx> diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 60143f9ed..1bdfc224a 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -37,9 +37,7 @@ #include <svtools/filter.hxx> #include <com/sun/star/io/XInputStream.hpp> -#ifndef SVTOOLS_SOURCE_MISC_IMAGERESOURCEACCESS_HXX #include "svtools/imageresourceaccess.hxx" -#endif #include <comphelper/processfactory.hxx> // -------------------- diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index c9c199b1e..0de35c2e3 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" -#ifndef FORMS_SOURCE_MISC_LISTENERCONTAINERS_HXX #include "listenercontainers.hxx" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 11d08f985..f8d61d552 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -30,9 +30,7 @@ #include "frm_strings.hxx" #include "property.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index fd677c130..ec699c14b 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -35,9 +35,7 @@ #include <vcl/svapp.hxx> //--------------------------------------------------- -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif //......................................................................... namespace frm diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 77f39ada4..e6e070caa 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -32,9 +32,7 @@ #include <svl/itemset.hxx> #include <svl/itempool.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/sfxuno.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 2289514ba..21e84d5f8 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "richtextcontrol.hxx" #include "frm_module.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "services.hxx" #include "richtextmodel.hxx" diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index c6918be2e..3eac45423 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -34,9 +34,7 @@ #include <editeng/editview.hxx> #include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/scripttypeitem.hxx> #include <editeng/editobj.hxx> diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 5a4957e37..2e27eb6b4 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "rtattributehandler.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index 4f662415f..880ac202a 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -30,9 +30,7 @@ #include "specialdispatchers.hxx" #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #define ITEMID_SCRIPTSPACE SID_ATTR_PARA_SCRIPTSPACE #include <editeng/scriptspaceitem.hxx> diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index ef3408522..d0f08d6d3 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -28,18 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" -#ifndef FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX #include "datatyperepository.hxx" -#endif #include "datatypes.hxx" -#ifndef _FRM_RESOURCE_HRC_ #include "frm_resource.hrc" -#endif #include "frm_resource.hxx" #include "frm_strings.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index ff62587a6..56a70fb70 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -29,9 +29,7 @@ #include "precompiled_forms.hxx" #include "datatypes.hxx" #include "resourcehelper.hxx" -#ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -#endif #include "convert.hxx" /** === begin UNO includes === **/ diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 8e8e98676..1919813d4 100755..100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -43,9 +43,7 @@ #include <hyphen.h> -#ifndef _HYPHENIMP_HXX #include <hyphenimp.hxx> -#endif #include <linguistic/hyphdta.hxx> #include <rtl/ustring.hxx> diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 894f9fd33..09cff2bdd 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -40,9 +40,7 @@ #include <hunspell.hxx> #include <dictmgr.hxx> -#ifndef _SPELLIMP_HXX #include <sspellimp.hxx> -#endif #include <linguistic/lngprops.hxx> #include <linguistic/spelldta.hxx> diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 580c3f92e..2359d0ead 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -29,20 +29,12 @@ #include "precompiled_package.hxx" #include <ManifestExport.hxx> #include <ManifestDefines.hxx> -#ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HXX #include <com/sun/star/xml/sax/XAttributeList.hpp> -#endif #include <rtl/ustrbuf.hxx> -#ifndef _BASE64_CODEC_HXX_ #include <Base64Codec.hxx> -#endif #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HXX #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <comphelper/documentconstants.hxx> #include <comphelper/attributelist.hxx> diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index a3908b206..32d4ad7ac 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -29,9 +29,7 @@ #include "precompiled_package.hxx" #include <ManifestImport.hxx> #include <ManifestDefines.hxx> -#ifndef _BASE64_CODEC_HXX_ #include <Base64Codec.hxx> -#endif #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 78f3dd335..9960371c5 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -30,21 +30,11 @@ #include <ManifestReader.hxx> #include <ManifestImport.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_SAXPARSEEXCEPTION_HPP #include <com/sun/star/xml/sax/SAXParseException.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP #include <com/sun/star/xml/sax/XParser.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif #include <vector> using namespace ::rtl; diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index 65b3a5e7c..e8e1db007 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -30,21 +30,11 @@ #include <ManifestWriter.hxx> #include <ManifestExport.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_SAXEXCEPTION_HPP #include <com/sun/star/xml/sax/SAXException.hpp> -#endif #include <osl/diagnose.hxx> diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 5c393ec08..b9ceb0b6f 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -30,9 +30,7 @@ #include <ManifestReader.hxx> #include <ManifestWriter.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP #include <com/sun/star/registry/XRegistryKey.hpp> -#endif #include <vos/diagnose.hxx> #include <ZipPackage.hxx> diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index ce4378609..878a7f0ba 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> -#ifndef _CRC32_HXX_ #include <CRC32.hxx> -#endif #include <string.h> // for memcpy #include <vector> diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index c5ff60801..b28b1b235 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_package.hxx" #include <com/sun/star/lang/DisposedException.hpp> -#ifndef _COM_SUN_STAR_LANG_INVALIDARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XStream.hpp> diff --git a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx index 3db87d389..3db87d389 100755..100644 --- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx +++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index b6251c44b..b6251c44b 100755..100644 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx index 94be3240c..56e7d6fed 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx @@ -4,9 +4,7 @@ #include "registrar.hxx" -#ifndef _REGISTRYVALUEIMPL_HXX_ #include "RegistryValueImpl.hxx" -#endif #include "windowsregistry.hxx" #include "registryexception.hxx" diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx index 6007f0cf3..6007f0cf3 100755..100644 --- a/setup_native/source/win32/customactions/reg64/reg64.cxx +++ b/setup_native/source/win32/customactions/reg64/reg64.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx index 8db277701..8db277701 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx index a9953ab74..a9953ab74 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx index 350d23bea..350d23bea 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx +++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx index e9682abaf..e9682abaf 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx index 466666250..466666250 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx +++ b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx index edd10943f..edd10943f 100755..100644 --- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx +++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx index eeac36ca8..899b340d6 100644 --- a/xmlsecurity/source/dialogs/stbcontrl.cxx +++ b/xmlsecurity/source/dialogs/stbcontrl.cxx @@ -29,12 +29,8 @@ #include "precompiled_xmlsecurity.hxx" #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -48,7 +44,6 @@ #define PAINT_OFFSET 5 - SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxBoolItem ); /* diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index eb9162e8b..5aa1b9d14 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -40,9 +40,7 @@ #include <osl/thread.h> #include "securityenvironment_mscryptimpl.hxx" -#ifndef _X509CERTIFICATE_NSSIMPL_HXX_ #include "x509certificate_mscryptimpl.hxx" -#endif #include <rtl/uuid.h> #include <xmlsec/xmlsec.h> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 17a60d931..8f5c08dd1 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -32,17 +32,11 @@ #include <rtl/uuid.h> #include "xmlencryption_mscryptimpl.hxx" -#ifndef _XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmldocumentwrapper_xmlsecimpl.hxx" -#endif -#ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmlelementwrapper_xmlsecimpl.hxx" -#endif -#ifndef _SECURITYENVIRONMENT_MSCRYPTIMPL_HXX_ #include "securityenvironment_mscryptimpl.hxx" -#endif #include "errorcallback.hxx" #include "xmlsec/xmlsec.h" diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index d18b52bf7..a857a9d12 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -31,9 +31,7 @@ #include <rtl/uuid.h> #include "securityenvironment_mscryptimpl.hxx" -#ifndef _XMLSECURITYCONTEXT_MSCRYPTIMPL_HXX_ #include "xmlsecuritycontext_mscryptimpl.hxx" -#endif #include "xmlstreamio.hxx" #include "xmlsec/xmlsec.h" diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index 428aa0d49..7a42ecb95 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -33,17 +33,11 @@ #include "com/sun/star/xml/crypto/SecurityOperationStatus.hdl" #include "xmlsignature_mscryptimpl.hxx" -#ifndef _XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmldocumentwrapper_xmlsecimpl.hxx" -#endif -#ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmlelementwrapper_xmlsecimpl.hxx" -#endif -#ifndef _SECURITYENVIRONMENT_MSCRYPTIMPL_HXX_ #include "securityenvironment_mscryptimpl.hxx" -#endif #include "xmlstreamio.hxx" #include "errorcallback.hxx" diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 3316730d8..b957b4874 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -47,9 +47,7 @@ #include <rtl/uuid.h> #include "x509certificate_nssimpl.hxx" -#ifndef _CERTIFICATEEXTENSION_NSSIMPL_HXX_ #include "certificateextension_xmlsecimpl.hxx" -#endif using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 7a360e372..84dea3c2c 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -31,17 +31,11 @@ #include <rtl/uuid.h> #include "xmlencryption_nssimpl.hxx" -#ifndef _XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmldocumentwrapper_xmlsecimpl.hxx" -#endif -#ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmlelementwrapper_xmlsecimpl.hxx" -#endif -#ifndef _SECURITYENVIRONMENT_NSSIMPL_HXX_ #include "securityenvironment_nssimpl.hxx" -#endif #include "errorcallback.hxx" #include <sal/types.h> diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index fdb676793..2f744ad57 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -31,9 +31,7 @@ #include <rtl/uuid.h> #include "securityenvironment_nssimpl.hxx" -#ifndef _XMLSECURITYCONTEXT_NSSIMPL_HXX_ #include "xmlsecuritycontext_nssimpl.hxx" -#endif #include "xmlstreamio.hxx" #include <sal/types.h> diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 7850f6239..0fb20aca8 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -31,21 +31,13 @@ #include <rtl/uuid.h> #include "xmlsignature_nssimpl.hxx" -#ifndef _XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmldocumentwrapper_xmlsecimpl.hxx" -#endif -#ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX_ #include "xmlelementwrapper_xmlsecimpl.hxx" -#endif -#ifndef _SECURITYENVIRONMENT_NSSIMPL_HXX_ #include "securityenvironment_nssimpl.hxx" -#endif -#ifndef _XMLSECURITYCONTEXT_NSSIMPL_HXX_ #include "xmlsecuritycontext_nssimpl.hxx" -#endif #include "xmlstreamio.hxx" #include "errorcallback.hxx" |