diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 16:59:40 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:11:20 +0200 |
| commit | facd86ef9cdac2f0acab13a8b525f0bfb99cac28 (patch) | |
| tree | b20099418ed50ea373d131c15835efd3946fab41 | |
| parent | 30afa21872109ef351ece5d0f0ad14e29d5e790e (diff) | |
remove include guards using fixguard.py
515 files changed, 1 insertions, 1605 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index d24ae795fd76..49ecfbbddb54 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -29,13 +29,9 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_ #include "soundhandler.hxx" -#endif -#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 1148e3bc8809..ff077f034e43 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -37,10 +37,8 @@ #include <tools/time.hxx> #include <vcl/svapp.hxx> #ifdef UNX -#ifndef _SV_SYSDATA_HXX #include <vcl/sysdata.hxx> #endif -#endif #ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_ #include <com/sun/star/awt/SystemPointer.hdl> diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index fd613a81673f..209163f7bf46 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -28,20 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/fsys.hxx> -#ifndef _SV_FILEDLG_HXX //autogen #include <svtools/filedlg.hxx> -#endif #include <tools/config.hxx> #include <vcl/font.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include <basic/sbx.hxx> #include <svtools/filedlg.hxx> @@ -60,9 +54,7 @@ #include <basic/basrdll.hxx> #include "basrid.hxx" -#ifndef _RUNTIME_HXX #include "runtime.hxx" -#endif #include "sbintern.hxx" #ifdef _USE_UNO diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx index 847a2fde02ec..34762e339a90 100644 --- a/basic/source/app/appbased.cxx +++ b/basic/source/app/appbased.cxx @@ -28,18 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <basic/sbx.hxx> #include <svtools/texteng.hxx> #include <svtools/textview.hxx> #include <basic/sbmeth.hxx> #include <svtools/stringtransfer.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "basic.hrc" #include "status.hxx" diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx index d5769f3acb31..3891fe188445 100644 --- a/basic/source/app/appedit.cxx +++ b/basic/source/app/appedit.cxx @@ -33,9 +33,7 @@ #include <svtools/texteng.hxx> #include <svl/undo.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "basic.hrc" #include "appedit.hxx" diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx index 001c77a38146..af9c0ec90a7c 100644 --- a/basic/source/app/apperror.cxx +++ b/basic/source/app/apperror.cxx @@ -29,9 +29,7 @@ #include "precompiled_basic.hxx" #include <tools/config.hxx> #include <svtools/ctrltool.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "basic.hrc" #include "apperror.hxx" diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx index b0a6c07ec956..d5c6f2c3f44c 100644 --- a/basic/source/app/appwin.cxx +++ b/basic/source/app/appwin.cxx @@ -29,9 +29,7 @@ #include "precompiled_basic.hxx" #include <stdio.h> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/fsys.hxx> #include <svtools/stringtransfer.hxx> diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx index 7bafc87e548a..27415a13698a 100644 --- a/basic/source/app/brkpnts.cxx +++ b/basic/source/app/brkpnts.cxx @@ -37,9 +37,7 @@ #include <tools/config.hxx> #include <vcl/gradient.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "brkpnts.hxx" #include "basic.hrc" diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 59c843e15538..e33bf15cccf1 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -32,33 +32,19 @@ #include <algorithm> #include <tools/rc.hxx> #include <vcl/metric.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 <tools/config.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/debug.hxx> -#ifndef _SV_FILEDLG_HXX //autogen #include <svtools/filedlg.hxx> -#endif #include <tools/stream.hxx> #include <tools/fsys.hxx> #include <svtools/stringtransfer.hxx> #include <vcl/splitwin.hxx> -#ifndef _ZFORLIST_HXX //autogen #include <svl/zformat.hxx> -#endif #include <svtools/ctrltool.hxx> diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 426394692176..9a2fa9ecf66e 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -37,18 +37,12 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 #include <cstdio> #include <tools/time.hxx> #include <tools/stream.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <tools/fsys.hxx> #include <svtools/stringtransfer.hxx> #include <unotools/syslocale.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "basic.hrc" #include "msgedit.hxx" #include "app.hxx" diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx index f69c4c468111..a1246a74e3e6 100644 --- a/basic/source/app/mybasic.cxx +++ b/basic/source/app/mybasic.cxx @@ -28,26 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <basic/sbx.hxx> // AB-Uno-Test //#define unotest #ifdef unotest -#ifndef _USR_UNO_HXX #include <usr/uno.hxx> -#endif #include <basic/sbuno.hxx> #include <sbunoobj.hxx> #endif #include "sbintern.hxx" -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include <basic/mybasic.hxx> #include "basic.hrc" #include "appbased.hxx" diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx index 0ad562970fe6..0064271cfca3 100644 --- a/basic/source/app/printer.cxx +++ b/basic/source/app/printer.cxx @@ -28,21 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include <algorithm> diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index c37af05ac8da..38a930947faf 100644 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -40,9 +40,7 @@ #include <tools/string.hxx> #include <osl/file.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif //#ifndef _BYTE_STRING_LIST //DECLARE_LIST( ByteStringList, ByteString * ); diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx index 2c811c125ba4..7c1d4a5afb19 100644 --- a/basic/source/app/processw.cxx +++ b/basic/source/app/processw.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 <osl/thread.h> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "processw.hxx" diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx index 0422bf56f4bd..150ea75ce242 100644 --- a/basic/source/app/textedit.cxx +++ b/basic/source/app/textedit.cxx @@ -32,9 +32,7 @@ #include <svtools/textview.hxx> #include <svtools/txtattr.hxx> #include <basic/sbxmeth.hxx> -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include "basic.hrc" #include "textedit.hxx" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 207f063d6ba8..aa3dad1062c6 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -52,9 +52,7 @@ #include <comphelper/documentinfo.hxx> #include <unotools/eventlisteneradapter.hxx> -#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H #include <rtl/instance.hxx> -#endif #include <map> diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a68d203fcee3..a68d203fcee3 100755..100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index cadd8f7e0e82..1659d9c8b317 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -30,9 +30,7 @@ //#include <stl_queue.h> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLERR_HXX //autogen #include <tools/errcode.hxx> -#endif #include <svl/hint.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 5b7e5c70591d..5b7e5c70591d 100755..100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index 89d473099f0b..40257b9cb67a 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -30,9 +30,7 @@ #include <tools/errcode.hxx> #include <svl/svdde.hxx> #include "ddectrl.hxx" -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif #define DDE_FREECHANNEL ((DdeConnection*)0xffffffff) diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index 17b98ad7addd..1c1c085870ed 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/edit.hxx> #include <vcl/dialog.hxx> diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 9940890286b4..e26fd0a7e384 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -29,9 +29,7 @@ #include "precompiled_basic.hxx" #include <vcl/dialog.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <osl/security.h> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1a60a5d79a45..6ea1f1f20ba1 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -31,9 +31,7 @@ #include <tools/date.hxx> #include <basic/sbxvar.hxx> -#ifndef _VOS_PROCESS_HXX #include <vos/process.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/sound.hxx> @@ -55,9 +53,7 @@ #include <tools/prewin.h> #include "winbase.h" #include <tools/postwin.h> -#ifndef _FSYS_HXX //autogen #include <tools/fsys.hxx> -#endif #else #include <osl/file.hxx> #endif diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 62e9c388f5c5..ebffbee9f23c 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -38,9 +38,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/timer.hxx> #include <basic/sbxvar.hxx> -#ifndef _SBX_HXX #include <basic/sbx.hxx> -#endif #include <svl/zforlist.hxx> #include <tools/fsys.hxx> #include <tools/urlobj.hxx> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 1bb6fb82e113..1bb6fb82e113 100755..100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx index 587b0ae7a590..587b0ae7a590 100755..100644 --- a/basic/source/runtime/step2.cxx +++ b/basic/source/runtime/step2.cxx diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx index 3c5fbeb3478c..c9729293a346 100644 --- a/basic/source/sample/object.cxx +++ b/basic/source/sample/object.cxx @@ -30,12 +30,8 @@ #include <tools/errcode.hxx> #include <basic/sbxobj.hxx> #include <basic/sbx.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include "object.hxx" #include "collelem.hxx" diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index c602b130fc5e..e5a2bb3f590f 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include <tools/errcode.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <basic/sbx.hxx> diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index b8aad9bbf2e4..739c86b13c84 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -37,9 +37,7 @@ #include <stdlib.h> #endif -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <math.h> #include <string.h> #include <ctype.h> diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index d518e7b9e6f5..02f872874d5e 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -32,9 +32,7 @@ #include "sbxconv.hxx" #include "sbxres.hxx" #include "runtime.hxx" -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif // Die Konversion eines Items auf String wird ueber die Put-Methoden // der einzelnen Datentypen abgewickelt, um doppelten Code zu vermeiden. diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c31aed1f8ef7..2e9474c3b94d 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -42,9 +42,7 @@ #include <rtl/uri.hxx> #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> -#ifndef INCLUDED_COMPHELPER_ANYTOSTRING_HXX #include <comphelper/anytostring.hxx> -#endif #include "namecont.hxx" #include <basic/basicmanagerrepository.hxx> @@ -67,9 +65,7 @@ #include <com/sun/star/script/LibraryNotLoadedException.hpp> #include "com/sun/star/deployment/ExtensionManager.hpp" #include <comphelper/storagehelper.hxx> -#ifndef _RTL_USTRING_HXX_ #include <comphelper/anytostring.hxx> -#endif #include <cppuhelper/exc_hlp.hxx> #include <basic/sbmod.hxx> diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index f7091d1c1a0b..3d81d4108bc4 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -43,9 +43,7 @@ #include <com/sun/star/task/ErrorCodeIOException.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COMPHELPER_STORAGEHELPER_HXX_ #include <comphelper/storagehelper.hxx> -#endif #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <osl/mutex.hxx> diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 61d3b06cb25d..8df1a36f605f 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 48c2736cd05a..48c2736cd05a 100755..100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index a17538d921d1..fa754183fa39 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -37,13 +37,9 @@ #include <com/sun/star/lang/XComponent.hpp> #include "ZPooledConnection.hxx" #include "ZPoolCollection.hxx" -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif using namespace ::com::sun::star::uno; diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index bd36b061b4d0..e2d687e52339 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" #include "ZPooledConnection.hxx" #include "ZConnectionWrapper.hxx" -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif #include <com/sun/star/sdbc/XCloseable.hpp> #include <comphelper/types.hxx> #include <comphelper/uno3.hxx> diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx index ec6d56f45d83..df488e43b2f1 100644 --- a/connectivity/source/drivers/adabas/BConnection.cxx +++ b/connectivity/source/drivers/adabas/BConnection.cxx @@ -33,9 +33,7 @@ #include "adabas/BCatalog.hxx" #include "odbc/OFunctions.hxx" #include "odbc/OTools.hxx" -#ifndef _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_ #include "adabas/BDatabaseMetaData.hxx" -#endif #include "adabas/BStatement.hxx" #include "adabas/BPreparedStatement.hxx" #include <com/sun/star/lang/DisposedException.hpp> diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx index 63bbd34bcc34..73551d4503ec 100644 --- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx +++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADABAS_BDATABASEMETADATA_HXX_ #include "adabas/BDatabaseMetaData.hxx" -#endif #include "FDatabaseMetaDataResultSet.hxx" using namespace connectivity::adabas; diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx index 00b94fe1311d..4decbba27f1a 100644 --- a/connectivity/source/drivers/adabas/BGroup.cxx +++ b/connectivity/source/drivers/adabas/BGroup.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADABAS_GROUP_HXX_ #include "adabas/BGroup.hxx" -#endif #include "adabas/BUsers.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx index 90da508c64ec..01e1e3c02ccf 100644 --- a/connectivity/source/drivers/adabas/BIndex.cxx +++ b/connectivity/source/drivers/adabas/BIndex.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "adabas/BIndex.hxx" -#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_ #include "adabas/BIndexColumns.hxx" -#endif #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include "adabas/BTable.hxx" diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx index 1811a78428c7..087d48e6d75c 100644 --- a/connectivity/source/drivers/adabas/BIndexColumns.cxx +++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_ #include "adabas/BIndexColumns.hxx" -#endif #include "connectivity/sdbcx/VIndexColumn.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx index f2c56a5cc3d9..a7398385829e 100644 --- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx +++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADABAS_BRESULTSETMETADATA_HXX_ #include "adabas/BResultSetMetaData.hxx" -#endif #include "adabas/BCatalog.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index d73ac4746fa3..1cf22e65917b 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "ado/ACatalog.hxx" -#ifndef _CONNECTIVITY_ADO_BCONNECTION_HXX_ #include "ado/AConnection.hxx" -#endif #include "ado/AGroups.hxx" #include "ado/AUsers.hxx" #include "ado/ATables.hxx" diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 2058469d44da..87ce2176eca4 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADO_GROUP_HXX_ #include "ado/AGroup.hxx" -#endif #include "ado/AUsers.hxx" #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#ifndef _CONNECTIVITY_ADO_BCONNECTION_HXX_ #include "ado/AConnection.hxx" -#endif #include "TConnection.hxx" using namespace connectivity::ado; diff --git a/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx index 16870dc9edb4..63d4f64ef928 100644 --- a/connectivity/source/drivers/ado/AKeyColumn.cxx +++ b/connectivity/source/drivers/ado/AKeyColumn.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_ADABAS_KEYCOLUMN_HXX_ #include "adabas/BKeyColumn.hxx" -#endif using namespace connectivity::adabas; namespace starbeans = ::com::sun::star::beans; diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx index 37d8e77031e9..dcf220e192b8 100644 --- a/connectivity/source/drivers/ado/AKeyColumns.cxx +++ b/connectivity/source/drivers/ado/AKeyColumns.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "adabas/BKeyColumns.hxx" -#ifndef _CONNECTIVITY_ADABAS_KEYCOLUMN_HXX_ #include "adabas/BKeyColumn.hxx" -#endif #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/DataType.hpp> diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index dccf4b5a4cf5..c31081d7db61 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "ado/AKeys.hxx" -#ifndef _CONNECTIVITY_ADO_INDEX_HXX_ #include "ado/AKey.hxx" -#endif #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 99733d1f79e5..394b2fe1b0ef 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -34,9 +34,7 @@ #include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#ifndef _CONNECTIVITY_ADO_BCONNECTION_HXX_ #include "ado/AConnection.hxx" -#endif #include "ado/Awrapado.hxx" using namespace connectivity::ado; diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 2d5e1a93d3ee..eab770da6229 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -30,12 +30,8 @@ #include "calc/CConnection.hxx" #include "calc/CDatabaseMetaData.hxx" #include "calc/CCatalog.hxx" -#ifndef _CONNECTIVITY_CALC_ODRIVER_HXX_ #include "calc/CDriver.hxx" -#endif -#ifndef CONNECTIVITY_RESOURCE_CALC_HRC #include "resource/calc_res.hrc" -#endif #include "resource/sharedresources.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index 64066b681728..56f961260d1b 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.cxx @@ -30,9 +30,7 @@ #include "calc/CTables.hxx" #include "calc/CTable.hxx" #include "file/FCatalog.hxx" -#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_ #include "file/FConnection.hxx" -#endif #include "calc/CCatalog.hxx" #include <comphelper/types.hxx> #include <rtl/logfile.hxx> diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index 530df50e1674..d7a57d255397 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -28,14 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_DBASE_OCONNECTION_HXX_ #include "dbase/DConnection.hxx" -#endif #include "dbase/DDatabaseMetaData.hxx" #include "dbase/DCatalog.hxx" -#ifndef _CONNECTIVITY_DBASE_ODRIVER_HXX_ #include "dbase/DDriver.hxx" -#endif #include <com/sun/star/lang/DisposedException.hpp> #include <tools/urlobj.hxx> #include "dbase/DPreparedStatement.hxx" diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 1e9b565cc4d7..854abb62537e 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_DBASE_ODbaseDatabaseMetaData_HXX_ #include "dbase/DDatabaseMetaData.hxx" -#endif #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx index f2c3050613e4..2ab46622be64 100644 --- a/connectivity/source/drivers/evoab/LConfigAccess.cxx +++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" #include "LConfigAccess.hxx" #include "LDriver.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx index 6a07a786d3ce..85ee7de384b3 100644 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif #include <tools/urlobj.hxx> #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -53,9 +51,7 @@ #include <map> #include <vector> -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include "diagnose_ex.h" using namespace ::comphelper; diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx index 3442d1a09854..a52893fdcbb4 100644 --- a/connectivity/source/drivers/evoab/LDebug.cxx +++ b/connectivity/source/drivers/evoab/LDebug.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <osl/diagnose.h> void evo_traceStringMessage( const sal_Char* _pFormat, const ::rtl::OUString& _rAsciiString ) diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 1a42ef028c54..30dc4e538194 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -53,9 +53,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <tools/debug.hxx> #include "connectivity/dbexception.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <unotools/syslocale.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index 6239765afe25..6bb15e860b08 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -54,9 +54,7 @@ #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> #include <unotools/syslocale.hxx> -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <map> using namespace ::comphelper; diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 04881536e18c..232a021a4a31 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -31,9 +31,7 @@ #include "NTable.hxx" #include "NTables.hxx" #include "NColumns.hxx" -#ifndef _CONNECTIVITY_EVOAB_CATALOG_HXX__ #include "NCatalog.hxx" -#endif using namespace connectivity; using namespace ::comphelper; diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index e7129f0ec254..0a770d2d9e8e 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <connectivity/sdbcx/VTable.hxx> #include "NCatalog.hxx" -#ifndef _CONNECTIVITY_EVOAB_BCONNECTION_HXX_ #include "NConnection.hxx" -#endif #include <comphelper/extract.hxx> #include "connectivity/dbtools.hxx" #include "connectivity/dbexception.hxx" diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index 7ac21ef50668..48e08af52e70 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include "file/FCatalog.hxx" -#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_ #include "file/FConnection.hxx" -#endif //#ifndef _CONNECTIVITY_FILE_OEMPTYCOLLECTION_HXX_ //#include "file/FEmptyCollection.hxx" //#endif diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 2e498cc45b29..978a8b60dba1 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.cxx @@ -31,9 +31,7 @@ #include "flat/ECatalog.hxx" -#ifndef _CONNECTIVITY_FLAT_DCONNECTION_HXX_ #include "flat/EConnection.hxx" -#endif #include "flat/ETables.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index c9cec7b5ee10..53effec8cde7 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -30,15 +30,11 @@ #include "flat/EConnection.hxx" #include "flat/EDatabaseMetaData.hxx" #include "flat/ECatalog.hxx" -#ifndef _CONNECTIVITY_FLAT_ODRIVER_HXX_ #include "flat/EDriver.hxx" -#endif #include <com/sun/star/lang/DisposedException.hpp> #include <tools/urlobj.hxx> #include "flat/EPreparedStatement.hxx" -#ifndef _CONNECTIVITY_FLAT_DSTATEMENT_HXX_ #include "flat/EStatement.hxx" -#endif #include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx index 2ddead6acfc0..b0b3681ba545 100644 --- a/connectivity/source/drivers/flat/EPreparedStatement.cxx +++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_FLAT_EPREPAREDSTATEMENT_HXX_ #include "flat/EPreparedStatement.hxx" -#endif #include "flat/EResultSet.hxx" using namespace connectivity::flat; diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 4f5670ace8aa..bb6cf0d1b034 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_JAVA_LANG_OBJJECT_HXX_ #include "java/lang/Class.hxx" -#endif #include "connectivity/CommonTools.hxx" #include <com/sun/star/uno/Exception.hpp> #include "java/tools.hxx" diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index 6496702adc7a..6496702adc7a 100755..100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 7268058b0c3b..7268058b0c3b 100755..100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index c1ba3f1fe6d0..c1ba3f1fe6d0 100755..100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 31b2bbfd6b1e..31b2bbfd6b1e 100755..100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 2794eafc5462..6b015cd0fbc8 100755..100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -34,9 +34,7 @@ #include "MacabGroup.hxx" #include "macabutilities.hxx" -#ifndef CONNECTIVITY_MACAB_DRIVER_HXX_ #include "MacabDriver.hxx" -#endif #include "FDatabaseMetaDataResultSet.hxx" #include "OTypeInfo.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 77823da25a66..77823da25a66 100755..100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index dc8943a46789..dc8943a46789 100755..100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index 35817526ff17..35817526ff17 100755..100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.cxx diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 173ffa9627d8..173ffa9627d8 100755..100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index f9492b5d4efc..f9492b5d4efc 100755..100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 8d50446f02a7..8d50446f02a7 100755..100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index b3c303324302..b3c303324302 100755..100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 9960ea7a4d97..9960ea7a4d97 100755..100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index 0bf6f1435075..0bf6f1435075 100755..100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index 5f60109fcd21..5f60109fcd21 100755..100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index ec3ff2eb9ff1..ec3ff2eb9ff1 100755..100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index bd14c007c5b4..bd14c007c5b4 100755..100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.cxx diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index c7ca7d37d325..6d74d7ebd74a 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" #include "MCatalog.hxx" -#ifndef _CONNECTIVITY_MOZAB_BCONNECTION_HXX_ #include "MConnection.hxx" -#endif #include "MTables.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 37d3a21a8a7c..b62752f758c3 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX #include "MConfigAccess.hxx" -#endif -#ifndef CONNECTIVITY_MOZAB_MEXTCONFIGACCESS_HXX #include "MExtConfigAccess.hxx" -#endif #include "MConnection.hxx" using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index acf1a0e83dc8..e66de2db4be4 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include "MCatalog.hxx" -#ifndef _CONNECTIVITY_MOZAB_BCONNECTION_HXX_ #include "MConnection.hxx" -#endif #include <comphelper/extract.hxx> #include "connectivity/dbtools.hxx" #include "connectivity/dbexception.hxx" diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 89a2978ea040..5b2714757ec6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -39,9 +39,7 @@ #include <osl/file.hxx> #include <rtl/bootstrap.hxx> -#ifndef CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX #include "MConfigAccess.hxx" -#endif #include "MNSDeclares.hxx" #include <osl/thread.hxx> #include <MNSTerminateListener.hxx> diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index ae143d7c4d0f..5a6c408d7945 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -33,12 +33,8 @@ #include "resource/mozab_res.hrc" #include "MDatabaseMetaDataHelper.hxx" -#ifndef _CONNECTIVITY_MAB_CONVERSIONS_HXX_ #include "MTypeConverter.hxx" -#endif -#ifndef CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX #include "MConfigAccess.hxx" -#endif #include <connectivity/dbexception.hxx> #include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx index dc9349732084..7b83fd43a175 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" #include "odbc/ODatabaseMetaData.hxx" #include "odbc/OTools.hxx" -#ifndef _CONNECTIVITY_ODBC_ORESULTSET_HXX_ #include "odbc/ODatabaseMetaDataResultSet.hxx" -#endif #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index 751ab7cf2988..f09da7641475 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -29,9 +29,7 @@ #include "precompiled_connectivity.hxx" #include "TConnection.hxx" -#ifndef _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_ #include "odbc/ODatabaseMetaDataResultSet.hxx" -#endif #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbc/ProcedureResult.hpp> diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 43e38f5a1674..84f3ec66c156 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ #include "connectivity/PColumn.hxx" -#endif #include "connectivity/dbtools.hxx" #include "TConnection.hxx" #include <comphelper/types.hxx> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c2bf75f740d1..3e7f48101b63 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -88,9 +88,7 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/task/XRestartManager.hpp> -#ifndef _COM_SUN_STAR_TASK_XJOBEXECUTOR_HPP_ #include <com/sun/star/task/XJob.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/task/XJob.hpp> @@ -101,17 +99,13 @@ #include <com/sun/star/java/XJavaVM.hpp> #include <tools/testtoolloader.hxx> #include <tools/solar.h> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vos/security.hxx> #include <vos/ref.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/componentcontext.hxx> #include <comphelper/configurationhelper.hxx> -#ifndef _UTL__HXX_ #include <unotools/configmgr.hxx> -#endif #include <unotools/configitem.hxx> #include <unotools/confignode.hxx> #include <unotools/ucbhelper.hxx> diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 664e63c7f6ca..664e63c7f6ca 100755..100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 546a6f0ad13c..c3c2ebd38ba6 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -43,14 +43,10 @@ #include <vos/ref.hxx> #include <vos/process.hxx> -#ifndef _TOOLS_RESMGR_HXX_ #include <tools/resmgr.hxx> -#endif #include <unotools/bootstrap.hxx> #include <svl/languageoptions.hxx> -#ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX #include <unotools/syslocaleoptions.hxx> -#endif #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index f92c6caa250c..f92c6caa250c 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 24b47aa223e3..24b47aa223e3 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 29bedf1b229f..29bedf1b229f 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index d0347c7cbf4e..d0347c7cbf4e 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 52011f1f0ca0..52011f1f0ca0 100755..100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 4e100fd99665..a75ec3d6ab7a 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -35,9 +35,7 @@ #include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_UNO_XNAMEINGSERVICE_HPP_ #include <com/sun/star/uno/XNamingService.hpp> -#endif #include <cppuhelper/factory.hxx> diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 7c2bb1133c68..7c2bb1133c68 100755..100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx index 87621960c61a..87621960c61a 100755..100644 --- a/desktop/unx/source/officeloader/officeloader.cxx +++ b/desktop/unx/source/officeloader/officeloader.cxx diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index c9a5983edea0..c9a5983edea0 100755..100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 9cf96b9fbd76..9cf96b9fbd76 100755..100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index cbc1d31bb217..cbc1d31bb217 100755..100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f3f54c78def1..f3f54c78def1 100755..100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 65f4bbb11ddc..5b6d8fa7bad8 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" #include <SvXMLAutoCorrectImport.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx index 3a4e209f3d4f..3a4e209f3d4f 100755..100644 --- a/editeng/source/misc/edtdlg.cxx +++ b/editeng/source/misc/edtdlg.cxx diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index ae92fd1a01b8..ae92fd1a01b8 100755..100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 0ca010c505fd..0ca010c505fd 100755..100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 19ea7b6b302a..420361253afd 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -31,9 +31,7 @@ #include <editeng/eeitem.hxx> #include <com/sun/star/uno/Any.hxx> -#ifndef _TOOLKIT_HELPRE_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 0312d28315a6..95461cd282bf 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -48,9 +48,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/XModifiable.hpp> -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCEESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 7624e8eef551..4222b79884c1 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/lang/XSingleComponentFactory.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/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -66,9 +64,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> -#ifndef _COM_SUN_STAR_UI_XCONFIGURATIONMANAGER_HPP_ #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#endif #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 9de41cfa2def..3c5d84374613 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -41,9 +41,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTBRODCASTER_HPP_ #include <com/sun/star/document/XEventBroadcaster.hpp> -#endif #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 20b053a5ce0e..f6aa48281f10 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/uri.hxx> #include <tools/debug.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" #define ENTER_MOD_METHOD() \ diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx index 699997bd2dbe..5e7783a0b92d 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.cxx +++ b/fpicker/source/aqua/SalAquaFilePicker.cxx @@ -43,14 +43,10 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLS_URLOBJ_HXX #include <tools/urlobj.hxx> -#endif #include "resourceprovider.hxx" -#ifndef _SV_RC_H #include <tools/rc.hxx> -#endif #include <osl/file.hxx> #include "CFStringUtilities.hxx" #include "NSString_OOoAdditions.hxx" diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx index 60857e47c6c3..d57a0b2f26fe 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.cxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx @@ -49,9 +49,7 @@ #include "resourceprovider.hxx" -#ifndef _SV_RC_H #include <tools/rc.hxx> -#endif #include <osl/file.hxx> #include "CFStringUtilities.hxx" diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx index 1a4132f23ea5..02dee945a039 100644 --- a/fpicker/source/aqua/SalAquaPicker.cxx +++ b/fpicker/source/aqua/SalAquaPicker.cxx @@ -37,17 +37,13 @@ #include <FPServiceInfo.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _SALAQUAPICKER_HXX_ #include "SalAquaPicker.hxx" -#endif #include <tools/urlobj.hxx> #include <osl/file.hxx> #include "CFStringUtilities.hxx" #include "NSString_OOoAdditions.hxx" -#ifndef _NSURL_OOOADDITIONS_HXX_ #include "NSURL_OOoAdditions.hxx" -#endif #include "SalAquaFilePicker.hxx" diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx index 51985208c7ed..658f0c37a0dc 100644 --- a/fpicker/source/aqua/resourceprovider.cxx +++ b/fpicker/source/aqua/resourceprovider.cxx @@ -37,13 +37,9 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#ifndef _SVTOOLS_SVTOOLS_HRC_ #include <svtools/svtools.hrc> -#endif -#ifndef _SVTOOLS_FILEDLG2_HRC_ #include <svtools/filedlg2.hrc> -#endif #include "NSString_OOoAdditions.hxx" #include "resourceprovider.hxx" diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index bcbfb2b2d70b..7c607e6ae06f 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -30,9 +30,7 @@ #include "sal/types.h" #include "rtl/ustring.hxx" -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include "cppuhelper/implementationentry.hxx" -#endif #include "com/sun/star/lang/XMultiComponentFactory.hpp" #ifdef WNT @@ -44,9 +42,7 @@ #include "svtools/miscopt.hxx" #include "svl/pickerhistoryaccess.hxx" -#ifndef _SV_APP_HXX #include "vcl/svapp.hxx" -#endif namespace css = com::sun::star; diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index e0b5d259302d..fa5d0cda0d8c 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <vcl/lstbox.hxx> -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_ #include <com/sun/star/uno/Sequence.hxx> -#endif #include <algorithm> #include <functional> diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 516c62fe7580..307d73c51257 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -59,9 +59,7 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include "vos/mutex.hxx" -#ifndef _SV_APP_HXX #include "vcl/svapp.hxx" -#endif // define ---------------------------------------------------------------- diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 52659e1f76f5..06aeee0e7f08 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -30,9 +30,7 @@ #include "precompiled_fpicker.hxx" #include "sal/types.h" -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include "cppuhelper/implementationentry.hxx" -#endif #include "OfficeFilePicker.hxx" #include "OfficeFolderPicker.hxx" diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index b9d7fac3aa3b..9d89ab1fe38b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -56,24 +56,16 @@ #include <toolkit/helper/vclunohelper.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _SVTOOLS_HRC #include "svtools/svtools.hrc" -#endif -#ifndef _SVT_HELPID_HRC #include "svtools/helpid.hrc" -#endif -#ifndef _SVTOOLS_IODLGIMPL_HRC #include "iodlg.hrc" -#endif #include "rtl/instance.hxx" #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" #include "svtools/inettbc.hxx" #include "unotools/syslocale.hxx" #include "svtools/QueryFolderName.hxx" -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> @@ -89,9 +81,7 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <osl/file.h> #include <vcl/waitobj.hxx> diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index c6b0acd6a33f..7983a932e290 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -53,9 +53,7 @@ #include <iostream> #include <algorithm> #include "resourceprovider.hxx" -#ifndef _SV_RC_H #include <tools/rc.hxx> -#endif //------------------------------------------------------------------------ // namespace directives diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx index f9c78d76639c..a49b7cf2b63a 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx @@ -50,9 +50,7 @@ #include <iostream> #include "resourceprovider.hxx" -#ifndef _SV_RC_H #include <tools/rc.hxx> -#endif //------------------------------------------------------------------------ // namespace directives diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index a3191ce77580..649a7a481c33 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -37,9 +37,7 @@ #include <cppuhelper/interfacecontainer.h> #include <osl/diagnose.h> -#ifndef _FILEPICKER_HXX_ #include "filepicker.hxx" -#endif #include "WinFileOpenImpl.hxx" #include "FPServiceInfo.hxx" diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index d5bcce4707f4..f57da48ef4cd 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp> #include "..\misc\WinImplHelper.hxx" -#ifndef _FILEPICKER_HXX_ #include "filepicker.hxx" -#endif #include "controlaccess.hxx" #include <rtl/ustrbuf.hxx> #include <rtl/string.hxx> diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index fcc369972ff8..982fdd69dd3d 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -36,13 +36,9 @@ #include "dibpreview.hxx" #include <osl/diagnose.h> -#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_ #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> -#endif -#ifndef _USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <stdexcept> #include <string> diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx index d8fee2044115..37ca335126f7 100644 --- a/fpicker/source/win32/filepicker/previewadapter.cxx +++ b/fpicker/source/win32/filepicker/previewadapter.cxx @@ -31,9 +31,7 @@ #include <tchar.h> #include "previewadapter.hxx" -#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_ #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> -#endif #include "dibpreview.hxx" #include "../misc/WinImplHelper.hxx" diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index 4e778e4fc011..b3976bbee13c 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -29,9 +29,7 @@ #include "precompiled_fpicker.hxx" #include "previewbase.hxx" -#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_ #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> -#endif using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index 8db37cefd34c..7c39d5d4a3aa 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -49,9 +49,7 @@ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#ifndef _COM_SUN_STAR_UI_DIALOGS_FILEDIALOGRESULTS_HPP_ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index acfe310e1cc6..87bd5a05aea1 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -33,9 +33,7 @@ //------------------------------------------------------------------------ #include <osl/diagnose.h> -#ifndef _FOLDERPICKER_HXX_ #include "folderpicker.hxx" -#endif #include <com/sun/star/lang/DisposedException.hpp> #include "WinFOPImpl.hxx" diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx index 717359ba511a..74dc3eb0612a 100644 --- a/fpicker/source/win32/folderpicker/Fopentry.cxx +++ b/fpicker/source/win32/folderpicker/Fopentry.cxx @@ -35,13 +35,9 @@ #include <com/sun/star/container/XSet.hpp> #include <osl/diagnose.h> -#ifndef _FILEPICKER_HXX_ #include "folderpicker.hxx" -#endif -#ifndef _FPSERVICEINFO_HXX_ #include "FOPServiceInfo.hxx" -#endif #include "WinFOPImpl.hxx" //----------------------------------------------------------------------- diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 1aac4f5f8c53..dde413a76a8b 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -32,15 +32,11 @@ // includes //------------------------------------------------------------------------ -#ifndef _WINDIRBROWSEIMPL_HXX_ #include "WinFOPImpl.hxx" -#endif #include <osl/diagnose.h> #include <com/sun/star/lang/EventObject.hpp> -#ifndef _COM_SUN_STAR_UI_FILEDIALOGRESULTS_HPP_ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#endif #include "FopEvtDisp.hxx" #include <osl/file.hxx> #include "FolderPicker.hxx" diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index 472562194566..1e21a6544a83 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -47,20 +47,14 @@ #include <sal/types.h> #include <osl/diagnose.h> -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif -#ifndef _COM_SUN_STAR_UI_FILEDIALOGRESULTS_HPP_ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <stdio.h> -#ifndef _FPSERVICEINFO_HXX_ #include "..\FOPServiceInfo.hxx" -#endif #include <osl/file.hxx> diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index b5448a93008c..8a9373bfd7e6 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -37,9 +37,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLS_SIMPLERESMGR_HXX #include <tools/simplerm.hxx> -#endif #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index f9fdd8ba3b19..9a8507a32419 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -47,9 +47,7 @@ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#ifndef _COM_SUN_STAR_UI_DIALOGS_FILEDIALOGRESULTS_HPP_ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 96a266818d31..46640833f894 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -32,22 +32,16 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #include <xml/acceleratorconfigurationreader.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HPP_ #include <com/sun/star/container/ElementExistException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif //_______________________________________________ // other includes diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 43772f5c4273..5fa33ad5681b 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -58,41 +58,23 @@ // other includes #include <vcl/svapp.hxx> -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include <com/sun/star/awt/KeyModifier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include <com/sun/star/util/XChangesNotifier.hpp> -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED #include <unotools/configpathes.hxx> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> -#endif #include <svtools/acceleratorexecute.hxx> diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index 98fe7bb7630b..503063655655 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -32,33 +32,19 @@ //=============================================== // includes -#ifndef __COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include <com/sun/star/frame/XModuleManager.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include <com/sun/star/awt/KeyModifier.hpp> -#endif -#ifndef __COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef __COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif //=============================================== // namespace diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 81edb165653c..0dd4ae3db139 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -29,61 +29,39 @@ #include "precompiled_framework.hxx" #include <accelerators/documentacceleratorconfiguration.hxx> -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #include <xml/acceleratorconfigurationreader.hxx> -#endif -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_ #include <xml/acceleratorconfigurationwriter.hxx> -#endif -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include <xml/saxnamespacefilter.hxx> -#endif //_______________________________________________ // own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif #include <services.h> //_______________________________________________ // interface includes -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include <com/sun/star/io/XSeekable.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_ #include <com/sun/star/io/XTruncate.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include <com/sun/star/xml/sax/InputSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_ #include <com/sun/star/xml/sax/XParser.hpp> -#endif //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif //_______________________________________________ // const diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 566311d6f5be..6e929f8b426a 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -34,9 +34,7 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif #include <services.h> //_______________________________________________ @@ -48,26 +46,16 @@ //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif #include <vcl/svapp.hxx> -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include <com/sun/star/util/XChangesNotifier.hpp> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.h> -#endif //_______________________________________________ // const diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index ecfe6d2a0a5f..fae13ca58905 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -41,41 +41,25 @@ //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_CONFIGURATION_CORRUPTEDUICONFIGURATIONEXCEPTION_HPP_ #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif //_______________________________________________ // other includes #include <vcl/svapp.hxx> -#ifndef _RTL_USTRBUF_HXX #include <rtl/ustrbuf.hxx> -#endif //_______________________________________________ // const diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 33776d8c7fc1..753c591a823e 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -38,37 +38,21 @@ //=============================================== // interface includes -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XPACKAGESTRUCTURECREATOR_HPP_ #include <com/sun/star/embed/XPackageStructureCreator.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef __COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include <com/sun/star/io/XSeekable.hpp> -#endif //=============================================== // other includes diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 76044ae6bb51..96612d66adcb 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -32,15 +32,11 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_HELPER_OINSTANCEPROVIDER_HXX_ #include <helper/oinstanceprovider.hxx> -#endif #include <classes/servicemanager.hxx> #include <macros/debug.hxx> -#ifndef __FRAMEWORK_DEFINES_HXX_ #include <defines.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,13 +52,9 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XFrames.hpp> -#ifndef _COM_SUN_STAR_CONNECTION_XConnection_HPP_ #include <com/sun/star/connection/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BRIDGE_XBridgeFactory_HPP_ #include <com/sun/star/bridge/XBridgeFactory.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index b3cad049ba95..39c702d5cca3 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ #include <services/logindialog.hxx> -#endif #include <classes/servicemanager.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index aa2aef3b9d2b..2aec7bfbc31d 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -46,9 +46,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/DateTime.hpp> diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index af25e786dbf1..6d35ef87d25b 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -32,23 +32,17 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_FRAMECONTAINER_HXX_ #include <classes/framecontainer.hxx> -#endif #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> -#ifndef __FRAMEWORK_COMMANDS_HXX_ #include <commands.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index e3f3e26ce995..e3f3e26ce995 100755..100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 35dab1ecbec1..34056cc3eae8 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -67,9 +67,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx index 5468e2fe721b..0a2ebde67151 100644 --- a/framework/source/constant/containerquery.cxx +++ b/framework/source/constant/containerquery.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_ #include <constant/containerquery.hxx> -#endif namespace framework{ namespace constant{ diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx index 239b365f565b..4d3a4f3e5375 100644 --- a/framework/source/constant/contenthandler.cxx +++ b/framework/source/constant/contenthandler.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_ #include <constant/contenthandler.hxx> -#endif namespace framework{ namespace constant{ diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx index bfa125aa04cb..3d321c92216e 100644 --- a/framework/source/constant/frameloader.cxx +++ b/framework/source/constant/frameloader.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> -#endif namespace framework{ namespace constant{ diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 17a29902466f..45eef7d1b59e 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -31,9 +31,7 @@ //_______________________________________________ // my own includes -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif //_______________________________________________ // interface includes diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 54228db4b670..cbb23a659d09 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -31,33 +31,19 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_DISPATCH_OXT_HANDLER_HXX_ #include <dispatch/oxt_handler.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ #include <threadhelp/transactionguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include <threadhelp/writeguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include <threadhelp/readguard.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include <services.h> -#endif -#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -71,13 +57,9 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> -#endif -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 789e07b58c52..789e07b58c52 100755..100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index ce25ac0796fc..acbfa062b9aa 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -34,9 +34,7 @@ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 68237179d70d..e82650aecb5a 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -33,9 +33,7 @@ //_________________________________________________________________________________________________________________ #include <helper/ocomponentenumeration.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 62f4b30de749..f0a7629bd246 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -33,9 +33,7 @@ //_________________________________________________________________________________________________________________ #include <helper/oframes.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index ee0fceeebc7a..87376aa40cd7 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -43,9 +43,7 @@ //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -56,9 +54,7 @@ #include <vcl/window.hxx> #include <vcl/syswin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 4c0738b9fe85..86c58f71f21c 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -44,9 +44,7 @@ // interface includes #include <com/sun/star/awt/Rectangle.hpp> -#ifndef _COM_SUN_STAR_AWT_XCONTROLS_HPP_ #include <com/sun/star/awt/XControl.hpp> -#endif #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/PosSize.hpp> @@ -56,9 +54,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif //----------------------------------------------- // includes of other projects diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index a71c5263455b..038a49c7ce44 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -43,9 +43,7 @@ //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/FrameAction.hpp> @@ -54,9 +52,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 9b6501af4c20..4cf98fc96791 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -28,113 +28,65 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ #include <helper/titlebarupdate.hxx> -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ #include <pattern/window.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include <threadhelp/writeguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include <threadhelp/readguard.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #include <macros/generic.hxx> -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include <services.h> -#endif -#ifndef __FRAMEWORK_PROPETIES_H_ #include <properties.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include <com/sun/star/frame/XModuleManager.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XMATERIALHOLDER_HPP_ #include <com/sun/star/beans/XMaterialHolder.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ #include <com/sun/star/beans/NamedValue.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif -#ifndef _UTL_CONFIGMGR_HXX #include <unotools/configmgr.hxx> -#endif -#ifndef _UTL_BOOTSTRAP_HXX #include <unotools/bootstrap.hxx> -#endif -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _SV_SYSWIN_HXX #include <vcl/syswin.hxx> -#endif -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _SV_WRKWIN_HXX #include <vcl/wrkwin.hxx> -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 3845c09ffb6f..7c89f62c5f05 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -40,9 +40,7 @@ //----------------------------------------------- // includes of external modules -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/svapp.hxx> //----------------------------------------------- diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index d5d11ebc2097..d034f6a50b42 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -49,9 +49,7 @@ #include <com/sun/star/document/FilterOptionsRequest.hpp> #include <com/sun/star/task/ErrorCodeRequest.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_LOCKEDDOCUMENTREQUEST_HPP_ #include <com/sun/star/document/LockedDocumentRequest.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index e3a6122d4938..dd0dab04fa95 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -34,9 +34,7 @@ #include <jobs/job.hxx> #include <jobs/joburl.hxx> -#ifndef __FRAMEWORK_CLASS_CONVERTER_HXX_ #include <classes/converter.hxx> -#endif #include <threadhelp/transactionguard.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index f72759891acb..1a2a7cfb21e7 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -34,9 +34,7 @@ // #include <math.h> -#ifndef _FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_ #include <services/layoutmanager.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include <services.h> @@ -46,9 +44,7 @@ #include <uiconfiguration/windowstateconfiguration.hxx> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <toolkit/helper/convert.hxx> #include <uielement/progressbarwrapper.hxx> #include <uiconfiguration/globalsettings.hxx> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 75bcc4c4587f..35ab2b4c5ca8 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -31,24 +31,16 @@ // includes of own project #include <loadenv/loadenv.hxx> -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> -#endif #include <classes/framelistanalyzer.hxx> #include <dispatch/interaction.hxx> -#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_ #include <constant/contenthandler.hxx> -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_ #include <constant/containerquery.hxx> -#endif #include <interaction/quietinteraction.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> @@ -97,9 +89,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/syswin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <unotools/moduleoptions.hxx> #include <svtools/sfxecode.hxx> #include <unotools/processfactory.hxx> diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 6abd17aa0efa..0ca9682d054e 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -31,9 +31,7 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> -#endif //_______________________________________________ // namespace diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 55e13252570f..ae06e8c66408 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -58,9 +58,7 @@ ) =================================================================================================================*/ -#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ #include <services/logindialog.hxx> -#endif COMPONENTGETIMPLEMENTATIONENVIRONMENT diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..8c358b5b5613 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -42,9 +42,7 @@ #include <properties.h> #include <services.h> -#ifndef _FRAMEWORK_HELPID_HRC #include <helpid.hrc> -#endif //_______________________________________________ // interface includes @@ -70,16 +68,12 @@ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <svl/urihelper.hxx> #include <osl/file.hxx> #include <unotools/configmgr.hxx> -#ifndef _UTL_BOOTSTRAP_HXX_ #include <unotools/bootstrap.hxx> -#endif namespace framework { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 293e03ee655b..ea42daed2507 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -33,19 +33,13 @@ //_________________________________________________________________________________________________________________ #include <loadenv/loadenv.hxx> -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> -#endif -#ifndef __FRAMEWORK_DESKTOP_HXX_ #include <services/desktop.hxx> -#endif #include <helper/ocomponentaccess.hxx> #include <dispatch/dispatchprovider.hxx> -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif #include <classes/taskcreator.hxx> #include <threadhelp/transactionguard.hxx> #include <threadhelp/writeguard.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 08a7c522831b..825b467bf5f2 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -34,9 +34,7 @@ #include <services/frame.hxx> #include <dispatch/dispatchprovider.hxx> -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif #include <dispatch/closedispatcher.hxx> #include <dispatch/windowcommanddispatch.hxx> #include <loadenv/loadenv.hxx> @@ -80,9 +78,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -97,9 +93,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> #include <unotools/moduleoptions.hxx> diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx index 8741fff39320..e65fbc2656bd 100644 --- a/framework/source/services/menudocumenthandler.cxx +++ b/framework/source/services/menudocumenthandler.cxx @@ -33,13 +33,9 @@ #include <classes/menuconfiguration.hxx> #include <classes/addonmenu.hxx> -#ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_ #include <services/attributelist.hxx> -#endif -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif using namespace ::rtl; diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 42a2637f823e..9dbbf031e566 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -30,9 +30,7 @@ //_______________________________________________ // my own includes -#ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_ #include <services/sessionlistener.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/resetableguard.hxx> #include <protocols.h> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 90c460b74298..be1ba436d3de 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -48,9 +48,7 @@ #include <unotools/localfilehelper.hxx> #include <unotools/configmgr.hxx> -#ifndef _UTL_BOOTSTRAP_HXX_ #include <unotools/bootstrap.hxx> -#endif #include <osl/mutex.hxx> #include <osl/file.hxx> #include <osl/security.hxx> diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 90bcdb93efbf..a1a17971d684 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -55,9 +55,7 @@ #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> //_______________________________________________ diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 107dccc80dc7..0d3ec5317298 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -51,9 +51,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 24e19977c680..24e19977c680 100755..100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 607efce4d4d6..ccdc9b64271e 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -36,9 +36,7 @@ #include <xml/menuconfiguration.hxx> #include <xml/toolboxconfiguration.hxx> -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include <xml/statusbarconfiguration.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 9ff03d3c6b39..163b2fb19ba8 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UICONFIGURATION_UICATEGORYDESCRPTION_HXX_ #include "uiconfiguration/uicategorydescription.hxx" -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -57,9 +55,7 @@ #include <unotools/configmgr.hxx> #include <tools/string.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <comphelper/sequence.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index e704fe680ae9..0589e3911953 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -36,9 +36,7 @@ #include <xml/menuconfiguration.hxx> #include <xml/toolboxconfiguration.hxx> -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include <xml/statusbarconfiguration.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 5b875d82f25a..021d4bda583c 100755..100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -37,9 +37,7 @@ #include <xml/toolboxconfiguration.hxx> #include <uiconfiguration/imagemanager.hxx> -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include <xml/statusbarconfiguration.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 0c4c610bd4b0..5cc504f15342 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -35,30 +35,18 @@ //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX #include <uielement/toolbar.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include <uielement/generictoolbarcontroller.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" #include <helper/imageproducer.hxx> #include <classes/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/addonsoptions.hxx> -#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include <uielement/comboboxtoolbarcontroller.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include <uielement/imagebuttontoolbarcontroller.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include <uielement/togglebuttontoolbarcontroller.hxx> -#endif #include <uielement/buttontoolbarcontroller.hxx> #include <uielement/spinfieldtoolbarcontroller.hxx> #include <uielement/edittoolbarcontroller.hxx> @@ -71,14 +59,10 @@ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_BEANS_XLAYOUTMANAGER_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include <com/sun/star/ui/DockingArea.hpp> -#endif #include <com/sun/star/lang/XMultiComponentFactory.hpp> //_________________________________________________________________________________________________________________ @@ -86,9 +70,7 @@ //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 315d1b6e0bf8..247646ff3ab5 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -40,9 +40,7 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/addonstoolbarmanager.hxx> -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include <uielement/toolbar.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -60,9 +58,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 4f55448d65d1..01bca93e6a78 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX #include "uielement/buttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 058005ffdc40..a4cc3f6be095 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include "uielement/comboboxtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -58,9 +54,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <vcl/toolbox.hxx> #include <vcl/combobox.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 2e1c88740750..058d455efe70 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX #include "uielement/complextoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -58,9 +54,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <dispatch/uieventloghelper.hxx> diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 0800103c743e..30e2fe28ce13 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX #include "uielement/dropdownboxtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -57,9 +53,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 387213d7c3eb..4fcdd62134d4 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX #include "uielement/edittoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -57,9 +53,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index c2625a951efb..bd2c43c339d0 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -48,16 +48,12 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 58cf3a3b02be..e3d7067d0512 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -48,21 +48,13 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/mapunit.hxx> -#ifndef _VCL_SVAPP_HXX_ #include <vcl/svapp.hxx> -#endif #include <vcl/i18nhelp.hxx> -#ifndef _VCL_OUTPUTDEVICE_HXX_ #include <vcl/outdev.hxx> -#endif #include <vcl/print.hxx> -#ifndef _SVTOOLS_CTRLTOOL_HXX_ #include <svtools/ctrltool.hxx> -#endif #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 16f26404697c..cc53634a21ae 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -34,9 +34,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ @@ -55,9 +53,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 3f37050e6780..23760e1a7c84 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include "uielement/generictoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -57,9 +53,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <classes/resource.hrc> #include <classes/fwkresid.hxx> diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index c0d7b48a401b..2ee7aad7dd46 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -35,9 +35,7 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ @@ -55,9 +53,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 5126ffdd253a..03387afbee92 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include "uielement/imagebuttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 651c9bbfdc86..779a141285a6 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -48,16 +48,12 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <com/sun/star/awt/XMenuExtended.hpp> #include <comphelper/processfactory.hxx> @@ -71,9 +67,7 @@ #include <svtools/langtab.hxx> #include <classes/fwlresid.hxx> -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 021ee4e8f8df..8b1a65c279ef 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -36,9 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> #include <com/sun/star/frame/XPopupMenuController.hpp> @@ -55,9 +53,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index 10dc8489e592..083b249369e6 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -35,9 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 606c644eeba9..3c10fc28bf94 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -35,9 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f75c7ad47198..57ba46c52262 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -62,9 +62,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> -#ifndef _COM_SUN_STAR_LANG_XSYSTEMDEPENDENT_HPP_ #include <com/sun/star/lang/SystemDependent.hpp> -#endif #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -84,9 +82,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/cmdoptions.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 786795ff1d14..8ed5b5354dae 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -34,9 +34,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> #include <classes/bmkmenu.hxx> #include <helper/imageproducer.hxx> diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 80dccb76db05..656dadc9d491 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -43,17 +43,13 @@ #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_EMBED_VERBDATTRIBUTES_HPP_ #include <com/sun/star/embed/VerbAttributes.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index a20f107ea22e..0d6c0fe04db0 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ #include <uielement/progressbarwrapper.hxx> -#endif //_________________________________________________________________________________________________________________ // my own includes diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 2e36a319efb6..128d1d896f80 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -35,9 +35,7 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ @@ -51,9 +49,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index 4e7855fb4900..d0e11aed4fcd 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -35,9 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index dad2775dc453..6dfc10d6afe1 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -31,17 +31,13 @@ #include <stdio.h> #include <wchar.h> -#ifndef __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX #include "uielement/spinfieldtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -60,9 +56,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #ifdef WINNT #include <systools/win32/snprintf.h> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 0bbdbc339a34..9688fedddaa5 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -62,9 +62,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <svtools/statusbarcontroller.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 030a790b35e3..31816e2fbeac 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -55,9 +55,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/solar.h> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index cf39edec2a7c..d2eb775c02a7 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include "uielement/togglebuttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 8152ea8519ce..d7b792231f19 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -34,12 +34,8 @@ //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX #include <uielement/toolbar.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include <uielement/generictoolbarcontroller.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" #include "general.h" @@ -47,9 +43,7 @@ #include <helper/imageproducer.hxx> #include <classes/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/addonsoptions.hxx> #include <uielement/toolbarmerger.hxx> #include <helper/acceleratorinfo.hxx> @@ -62,9 +56,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include <com/sun/star/ui/DockingArea.hpp> -#endif #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -84,9 +76,7 @@ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> #include <unotools/cmdoptions.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/mediadescriptor.hxx> #include <svtools/miscopt.hxx> #include <svl/imageitm.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 65162b96561f..b3155602d794 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -36,9 +36,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> #include <helper/imageproducer.hxx> @@ -63,17 +61,13 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/image.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> #include <unotools/cmdoptions.hxx> diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 5a4fb7cddde4..94e0f7b271bd 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -39,9 +39,7 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/toolbarmanager.hxx> -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include <uielement/toolbar.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -59,9 +57,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 0d50aa4c36d4..54da460aef17 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -54,9 +54,7 @@ #include <unotools/configmgr.hxx> #include <tools/string.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <comphelper/sequence.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 68331e1e0e97..78247d8aa3f3 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 505f3418ed8c..505f3418ed8c 100755..100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 3cc132d9cb48..376eaa4789a8 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -45,17 +45,13 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index ddbe47912a0e..ec4f297957d2 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -45,9 +45,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index f2e9aa9bc0d2..0142ddcedffc 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 418280360bf0..1959e0c2a9c8 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -32,9 +32,7 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif //_______________________________________________ // interface includes diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx index 75a024eb8405..f6037054c8a8 100644 --- a/framework/source/xml/eventsconfiguration.cxx +++ b/framework/source/xml/eventsconfiguration.cxx @@ -31,9 +31,7 @@ #include <xml/eventsdocumenthandler.hxx> #include <services.h> -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include <xml/saxnamespacefilter.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -47,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx index a1cc33b02dad..b3f88f11d14c 100644 --- a/framework/source/xml/eventsdocumenthandler.cxx +++ b/framework/source/xml/eventsdocumenthandler.cxx @@ -42,9 +42,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 75517d2766dd..8e617f21d702 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -30,9 +30,7 @@ #include <xml/imagesconfiguration.hxx> #include <services.h> -#ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_ #include <xml/imagesdocumenthandler.hxx> -#endif #include <xml/saxnamespacefilter.hxx> //_________________________________________________________________________________________________________________ @@ -47,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 83d42b82c539..a8dfe0f7fced 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -42,9 +42,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx index 010c96349d8c..e6e4e47de1b5 100644 --- a/framework/source/xml/menuconfiguration.cxx +++ b/framework/source/xml/menuconfiguration.cxx @@ -33,17 +33,13 @@ //_________________________________________________________________________________________________________________ #include <xml/menuconfiguration.hxx> -#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_ #include <classes/bmkmenu.hxx> -#endif #include <classes/addonmenu.hxx> #include <xml/menudocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> #include <services.h> -#ifndef _FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ #include <uielement/rootitemcontainer.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx index 2b9d3e5baa58..e8ed57ee05f5 100644 --- a/framework/source/xml/statusbarconfiguration.cxx +++ b/framework/source/xml/statusbarconfiguration.cxx @@ -45,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx index 370ca6e3f18a..7331092381f3 100644 --- a/framework/source/xml/statusbardocumenthandler.cxx +++ b/framework/source/xml/statusbardocumenthandler.cxx @@ -42,9 +42,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx index 9d1c91aa6849..3f1b641cb719 100644 --- a/framework/source/xml/toolboxconfiguration.cxx +++ b/framework/source/xml/toolboxconfiguration.cxx @@ -45,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx index 1e70fb31b397..042519ca5d1e 100644 --- a/framework/test/threadtest.cxx +++ b/framework/test/threadtest.cxx @@ -36,13 +36,9 @@ #include <threadhelp/resetableguard.hxx> #include <threadhelp/transactionguard.hxx> -#ifndef __FRAMEWORK_THREADHELP_RWLOCKBASE_HXX_ #include <threadhelp/rwlockbase.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -60,9 +56,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/time.h> -#ifndef _OSL_INTERLOCK_H_ #include <osl/interlock.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx index cb86a7f08358..2447eef221f4 100644 --- a/framework/test/threadtest/threadtest.cxx +++ b/framework/test/threadtest/threadtest.cxx @@ -33,9 +33,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -57,9 +55,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/time.h> -#ifndef _OSL_INTERLOCK_H_ #include <osl/interlock.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx index 9f7272ee4524..2ab04fccb521 100644 --- a/idl/source/cmptools/char.cxx +++ b/idl/source/cmptools/char.cxx @@ -32,9 +32,7 @@ #include <ctype.h> #include <string.h> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <char.hxx> diff --git a/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx index 607cc91e1bf6..6b1ed077bc87 100644 --- a/idl/source/prj/idldll.cxx +++ b/idl/source/prj/idldll.cxx @@ -31,9 +31,7 @@ #ifdef WIN #include <svwin.h> -#ifndef _SYSDEP_HXX #include <sysdep.hxx> -#endif // Statische DLL-Verwaltungs-Variablen static HINSTANCE hDLLInst = 0; // HANDLE der DLL diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 2916b2ee6eec..69371234eebd 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -42,9 +42,7 @@ #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/Locale.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.h> -#endif #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index f3d56f7024a9..7d5327e157aa 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/EventObject.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.h> -#endif #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/util/XFlushListener.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index fe53bf344ac3..fe53bf344ac3 100755..100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 207284230b4c..fec31a54d91a 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -42,9 +42,7 @@ #include <com/sun/star/linguistic2/XConversionDictionary.hpp> #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp> #include <com/sun/star/lang/Locale.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.h> -#endif #include <com/sun/star/registry/XRegistryKey.hpp> #include "hhconvdic.hxx" diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 81981093e2f8..cb4d7c4de388 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -37,9 +37,7 @@ #include <unotools/processfactory.hxx> #include <osl/mutex.hxx> -#ifndef _SPELLIMP_HXX #include <sspellimp.hxx> -#endif #include "lngprops.hxx" #include "spelldta.hxx" diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 69cc6f40cd3d..73f6abd1c87d 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <rtl/uri.hxx> #include <osl/process.h> #include <osl/file.hxx> diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index dbade7172e6e..dbade7172e6e 100755..100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx index 08a27a19562f..08a27a19562f 100755..100644 --- a/scripting/source/provider/ScriptingContext.cxx +++ b/scripting/source/provider/ScriptingContext.cxx diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index 48f21367e762..94f2fd72b4a6 100755..100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_scripting.hxx" -#ifndef _VCL_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include "ScriptExecDialog.hrc" diff --git a/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx index 3fde4e466974..3fde4e466974 100755..100644 --- a/scripting/source/storage/ScriptSecurityManager.cxx +++ b/scripting/source/storage/ScriptSecurityManager.cxx diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 58b6c21b522f..49c124d4b019 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 9f38acb7e2a6..9f38acb7e2a6 100755..100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 6e13894feb49..f305114b5951 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -43,14 +43,10 @@ #include <basic/basrdll.hxx> #include <svtools/asynclink.hxx> #include <svl/stritem.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <svl/eitem.hxx> #include <svl/urlbmk.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> @@ -78,9 +74,7 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 6afa8c68ed83..b1f4fa843508 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -30,15 +30,11 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XFlushable.hpp> -#ifndef _STDLIB_H #include <stdlib.h> -#endif #include <tools/config.hxx> #include <vcl/sound.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 38ea69280c49..a931ed5aef71 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -29,9 +29,7 @@ #include "precompiled_sfx2.hxx" #include <tools/cachestr.hxx> #include <tools/config.hxx> -#ifndef _INETSTRM_HXX //autogen #include <svl/inetstrm.hxx> -#endif #include <svl/stritem.hxx> #define _SVSTDARR_STRINGS diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 08023c5414a6..f687d3fe6be3 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -39,20 +39,14 @@ #include <unotools/saveopt.hxx> #include <unotools/localisationoptions.hxx> #include <tools/config.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif #include <tools/urlobj.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/ehdl.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/configmgr.hxx> #include <rtl/ustrbuf.hxx> #include <vos/security.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 70147e8d9146..f89aea707961 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -29,9 +29,7 @@ #include "precompiled_sfx2.hxx" #include <vcl/status.hxx> #include <vcl/msgbox.hxx> -#ifndef _VOS_PROCESS_HXX //autogen #include <vos/process.hxx> -#endif #include <vos/xception.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> @@ -41,9 +39,7 @@ #include <unotools/internaloptions.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/registry/InvalidRegistryException.hpp> -#ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index d615d90ff37a..84119d5a0ec6 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -34,9 +34,7 @@ #define _TL_LANG_SPECIAL #endif #include <svl/svdde.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/eitem.hxx> #include <unotools/saveopt.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index c41f92ce66ad..7be7974b55e2 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> @@ -40,9 +38,7 @@ #include <com/sun/star/frame/XDispatchHelper.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/util/XCloseable.hpp> -#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ #include <com/sun/star/util/CloseVetoException.hpp> -#endif #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/embed/XStorage.hpp> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 6f9d3b258745..03e8c9c2c88d 100755..100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -52,9 +52,7 @@ #include <basic/sbxobj.hxx> #include <basic/sberrors.hxx> #include <basic/basmgr.hxx> -#ifndef _BASIC_SBUNO_HXX #include <basic/sbuno.hxx> -#endif #include <basic/sbxcore.hxx> #include <svl/ownlist.hxx> diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b8e8a92da1b8..e5c243677b7a 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _RCID_H #include <tools/rcid.h> -#endif #include <unotools/viewoptions.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 597509cf34bd..2b5b59a0205a 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -70,9 +70,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XFrame.hpp> -#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/XComponent.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 3fce25e7e0d6..2762896ac67c 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -52,9 +52,7 @@ #include <com/sun/star/document/UpdateDocMode.hpp> #include <sfx2/filedlghelper.hxx> #include <sfx2/fcontnr.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <cppuhelper/compbase1.hxx> #include <sfx2/dispatch.hxx> #include <comphelper/extract.hxx> diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index b9799f5818b7..de231b10f66b 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -12,9 +12,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include <sfx2/app.hxx> -#ifndef _SFX_APP_HRC #include "app.hrc" -#endif #ifndef __SHUTDOWNICON_HXX__ #define USE_APP_SHORTCUTS #include "shutdownicon.hxx" diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index f9a388deee5c..bced46d0f02f 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -59,9 +59,7 @@ #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <svl/intitem.hxx> -#ifndef _SFXEITEM_HXX //autogen #include <svl/eitem.hxx> -#endif #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 817b7d94b357..339d956675dc 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -40,9 +40,7 @@ #include <comphelper/sequenceashashmap.hxx> -#ifndef _EXCHANGE_HXX //autogen #include <sot/exchange.hxx> -#endif #include <tools/config.hxx> #include <basic/sbmeth.hxx> #include <basic/basmgr.hxx> @@ -50,12 +48,8 @@ #include <basic/sbxobj.hxx> #include <basic/sbxmeth.hxx> #include <basic/sbxcore.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _RTL_USTRING_HXX //autogen #include <rtl/ustring.hxx> -#endif #include <rtl/ustrbuf.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -84,9 +78,7 @@ #include <com/sun/star/frame/XFilterDetect.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <sal/types.h> diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index df81eb3f4039..4b5db9e8f1a2 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _INETDEF_HXX #include <svl/inetdef.hxx> -#endif #include "svtools/htmlkywd.hxx" //!(dv) #include <chaos2/cntapi.hxx> diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 3af0ba2b0a6f..d8813edb5245 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -32,9 +32,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#ifndef _SBX_HXX //autogen #include <basic/sbx.hxx> -#endif #include <svl/eitem.hxx> #include <tools/time.hxx> diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 9935c3a18c8b..8e01ce55c81a 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <vcl/msgbox.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif #include <svl/lstner.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index e66dd2c56eaf..3d111c41e6d7 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -34,13 +34,9 @@ #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <svl/intitem.hxx> -#ifndef _SFXEITEM_HXX //autogen #include <svl/eitem.hxx> -#endif #include <svl/undo.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <svtools/ttprops.hxx> #include <stdio.h> #include <stdarg.h> diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 9e8657ae0c82..3c9212513eeb 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -29,15 +29,11 @@ #include "precompiled_sfx2.hxx" #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> -#ifndef _SBX_HXX //autogen #include <basic/sbx.hxx> -#endif #include <svl/intitem.hxx> #include <basic/sbmeth.hxx> #include <basic/sbmod.hxx> -#ifndef _BASIC_SBUNO_HXX #include <basic/sbuno.hxx> -#endif #include <osl/mutex.hxx> @@ -47,9 +43,7 @@ #ifndef GCC #endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/intlwrapper.hxx> #include <sfx2/msgpool.hxx> diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 88a52d0ad0bf..018392b2ebda 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -38,9 +38,7 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <svl/itemiter.hxx> -#ifndef _ARGS_HXX //autogen #include <svl/itempool.hxx> -#endif #include <svtools/itemdel.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 14cf5fb25cc0..5e6c5c9b9c96 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -31,12 +31,8 @@ // include --------------------------------------------------------------- #include <aboutbmpnames.hxx> -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #ifndef GCC #endif diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 01e2b0607bea..01e2b0607bea 100755..100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 0e0c6ec22ee1..4e422388b965 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -47,9 +47,7 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/security/CertificateValidity.hpp> -#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_ #include <com/sun/star/security/DocumentSignatureInformation.hpp> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -57,9 +55,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/document/XExporter.hpp> -#ifndef _RTL_TEXTENC_H #include <rtl/textench.h> -#endif #include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index 16d12f469205..90d1222fb15f 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/system/XSimpleMailClientSupplier.hpp> #include <com/sun/star/system/SimpleMailClientFlags.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -#ifndef _RTL_TEXTENC_H #include <rtl/textench.h> -#endif #include <vos/mutex.hxx> #include <rtl/uri.h> #include <rtl/uri.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 1f5472cf2052..d369c1aaf490 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/field.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -53,9 +51,7 @@ #include "dialog.hrc" #include "mgetempl.hrc" -#ifndef _SFX_STYLE_HRC #include <svl/style.hrc> -#endif // SfxManageStyleSheetPage ----------------------------------------------- diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index cbbe20bfa203..6761821a123c 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -43,9 +43,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/PosSize.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <toolkit/helper/vclunohelper.hxx> diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx index d62ed70b8490..d62ed70b8490 100755..100644 --- a/sfx2/source/dialog/sfxdlg.cxx +++ b/sfx2/source/dialog/sfxdlg.cxx diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index f6e5f96cf0bd..f4f6df8ada09 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -35,9 +35,7 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <unotools/viewoptions.hxx> #ifndef GCC #endif diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index ff6406f0d5d3..be706e5ec667 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -31,9 +31,7 @@ // include --------------------------------------------------------------- #include <svl/whiter.hxx> #include <svl/style.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #ifndef GCC #endif diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9edeb05b43ac..61a8208472b6 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index beb43c192810..8654a80ef06e 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index 642fe3c21af8..dc14d650cc71 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -33,9 +33,7 @@ #include "sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "doc.hrc" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif // ----------------------------------------------------------------------------- short ExecuteQuerySaveDocument(Window* _pParent,const String& _rTitle) { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 29081e8e8418..d81d316e789a 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -71,9 +71,7 @@ #include <com/sun/star/logging/XSimpleLogRing.hpp> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_ #include <com/sun/star/security/DocumentSignatureInformation.hpp> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <tools/zcodec.hxx> #include <tools/cachestr.hxx> @@ -84,9 +82,7 @@ #include <framework/interaction.hxx> #include <unotools/streamhelper.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/lckbitem.hxx> diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index 7a5fea18004f..94cd06f25472 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/stritem.hxx> #ifndef GCC #endif diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index db6f2a2d133f..b6546127853e 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -33,9 +33,7 @@ #include <vos/mutex.hxx> #include <vos/thread.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 71f3683c0006..a6cb7956b376 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -34,9 +34,7 @@ #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 277199d30051..c9723b1b9295 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -28,24 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/StringPair.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP #include <com/sun/star/xml/sax/XParser.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif #include <comphelper/attributelist.hxx> diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 719dc5b8d223..4a2ff9fdc78d 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -34,9 +34,7 @@ #include <stdio.h> -#ifndef _SV_PRNSETUP_HXX //autogen #include <svtools/prnsetup.hxx> -#endif #include <vcl/cmdevt.hxx> #include <vcl/menubtn.hxx> #include <vcl/msgbox.hxx> @@ -73,9 +71,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <svtools/localresaccess.hxx> -#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ #include <svtools/addresstemplate.hxx> -#endif #include <comphelper/processfactory.hxx> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index d3235b1c7a7f..35231071b9f3 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -31,9 +31,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/msgbox.hxx> #include <vcl/morebtn.hxx> -#ifndef _SVMEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <svl/itemset.hxx> #include <svl/eitem.hxx> #include <svtools/sfxecode.hxx> @@ -42,9 +40,7 @@ #include <unotools/localfilehelper.hxx> #include "new.hrc" -#ifndef _SFX_DOC_HRC #include "doc.hrc" -#endif #include <sfx2/sfx.hrc> #include "helpid.hrc" #include "sfxtypes.hxx" diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index e386b2382acf..ae015087740b 100755..100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _INETMSG_HXX //autogen #include <svl/inetmsg.hxx> -#endif #include <tools/diagnose_ex.h> #include <svl/eitem.hxx> #include <svl/stritem.hxx> @@ -48,9 +46,7 @@ #include <com/sun/star/script/InterruptReason.hpp> #include <com/sun/star/script/XEngineListener.hpp> #include <com/sun/star/script/XDebugging.hpp> -#ifndef _COM_SUN_STAR_SCRIPT_XINVOKATION_HPP_ #include <com/sun/star/script/XInvocation.hpp> -#endif #include <com/sun/star/script/ContextInformation.hpp> #include <com/sun/star/script/FinishReason.hpp> #include <com/sun/star/script/XEngine.hpp> @@ -69,9 +65,7 @@ #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.h> @@ -98,12 +92,8 @@ using namespace ::com::sun::star::script::provider; using namespace ::com::sun::star::container; #include <basic/sbuno.hxx> #include <basic/sbstar.hxx> -#ifndef _SB_BASMGR_HXX #include <basic/basmgr.hxx> -#endif -#ifndef _VCL_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include <basic/sbx.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index bc8b23d726fb..3f38b5692818 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index d6b9a6edb0eb..e035d395c691 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -41,15 +41,9 @@ #include <com/sun/star/frame/XTitle.hpp> #include <vos/mutex.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/eitem.hxx> #include <tools/rtti.hxx> @@ -64,15 +58,11 @@ #include <sfx2/signaturestate.hxx> #include <sfx2/sfxmodelfactory.hxx> -#ifndef _BASIC_SBUNO_HXX #include <basic/sbuno.hxx> -#endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <unotools/printwarningoptions.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index d6192542d1a1..d6192542d1a1 100755..100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 2cd195976832..2cd195976832 100755..100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx index a1025370ed24..a1025370ed24 100755..100644 --- a/sfx2/source/doc/syspath.cxx +++ b/sfx2/source/doc/syspath.cxx diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 4ac85a7c98fe..3fb48d599576 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -33,24 +33,16 @@ #ifndef GCC #endif #include <com/sun/star/uno/Any.h> -#ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPLLIER_HPP_ #include <com/sun/star/frame/XFramesSupplier.hpp> -#endif #include <com/sun/star/task/XInteractionHandler.hpp> #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <unotools/historyoptions.hxx> #include <svl/folderrestriction.hxx> #include <vcl/toolbox.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _VOS_THREAD_HXX //autogen #include <vos/thread.hxx> -#endif -#ifndef _VOS_MUTEX_HXX //autogen #include <vos/mutex.hxx> -#endif #include <rtl/ustring.hxx> #include <svl/itemset.hxx> diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 281b451d8098..fdd362203726 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -40,13 +40,9 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/util/XURLTransformer.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <tools/urlobj.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index bc765b95340c..9e8028848e78 100755..100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -40,9 +40,7 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <cstdarg> // std::va_list -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #ifndef GCC #endif diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx index e9d609151504..48fb64e357fc 100644 --- a/sfx2/source/menu/objmnctl.cxx +++ b/sfx2/source/menu/objmnctl.cxx @@ -31,12 +31,8 @@ #include <com/sun/star/embed/VerbAttributes.hpp> #include <tools/list.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _SXSTRITEM_HXX //autogen #include <svl/stritem.hxx> -#endif #ifndef GCC #endif diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index de1137bd6a74..de1137bd6a74 100755..100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 13c84bc531e2..70160b95ec29 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <comphelper/processfactory.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> #ifndef GCC @@ -67,9 +65,7 @@ #include <sfx2/objsh.hxx> #include <framework/addonsoptions.hxx> -#ifndef __FRAMEWORK_CLASSES_ADDONMENUS_HXX_ #include <framework/addonmenu.hxx> -#endif #include <framework/menuconfiguration.hxx> using namespace ::com::sun::star::container; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 32e6887f802c..7aa5ef9f2745 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -31,13 +31,9 @@ //-------------------------------------------------------------------------------------------------------- #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _COM_SUN_STAR_UTL_URL_HPP_ #include <com/sun/star/util/URL.hpp> -#endif -#ifndef _COM_SUN_STAR_UTL_XURLTRANSFORMER_HPP_ #include <com/sun/star/util/XURLTransformer.hpp> -#endif #include <tools/urlobj.hxx> #include <svl/macitem.hxx> #include <sfx2/appuno.hxx> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index defccd4e23be..b85d9d1589a4 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -57,9 +57,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 7694932d44c4..bac879fdb0b8 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -49,9 +49,7 @@ #ifndef GCC #endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f5b38d5a8a18..c52b65743852 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -71,9 +71,7 @@ #include <framework/menuconfiguration.hxx> #include <framework/sfxhelperfunctions.hxx> #include <vcl/taskpanelist.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <svtools/menuoptions.hxx> #include <svtools/miscopt.hxx> diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 16384a068d4f..acd4eff1d8af 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -37,22 +37,14 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/container/XChild.hpp> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <svl/intitem.hxx> -#ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> -#endif #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <com/sun/star/awt/PosSize.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/msgbox.hxx> #ifndef GCC diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index b15392372b19..09fb50578cb9 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -31,16 +31,12 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/urlobj.hxx> #ifndef GCC #endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/intlwrapper.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index a7f5c9d16541..3e5dc7008d4e 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -36,12 +36,8 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> -#endif #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> #include <svl/visitem.hxx> @@ -50,9 +46,7 @@ #include <svl/slstitm.hxx> #include <svl/whiter.hxx> #include <svl/undo.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 5c65c967434f..f83709b1b5f8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -91,9 +91,7 @@ #include <sfx2/docfilt.hxx> // #110897# -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx index b4408e2f7737..b4408e2f7737 100755..100644 --- a/shell/qa/recent_docs.cxx +++ b/shell/qa/recent_docs.cxx diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx index 2fc4a0c79297..d45a0f76c2f9 100644 --- a/shell/source/all/ooofilereader/basereader.cxx +++ b/shell/source/all/ooofilereader/basereader.cxx @@ -29,9 +29,7 @@ #include "precompiled_shell.hxx" #include "internal/basereader.hxx" -#ifndef XML_PARSER_HXX_INCLUDED #include "internal/xml_parser.hxx" -#endif #include "assert.h" #include <memory> diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index b7f73d2404a8..b8b9591c87bc 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" -#ifndef XML_PARSER_HXX_INCLUDED #include "internal/xml_parser.hxx" -#endif #include "internal/i_xml_parser_event_handler.hxx" #include <assert.h> diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 576501e4da9f..ad6b4e19cb7b 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -30,9 +30,7 @@ #include <localebackend.hxx> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <com/sun/star/uno/XComponentContext.hpp> namespace css = com::sun::star ; diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 18cf2806c16b..2d2d8e0f22e9 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -31,9 +31,7 @@ #include "macbackend.hxx" #include <com/sun/star/registry/XRegistryKey.hpp> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <com/sun/star/uno/XComponentContext.hpp> namespace css = com::sun::star; diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 862600009e30..29422836cf51 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -31,9 +31,7 @@ #include <wininetbackend.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <com/sun/star/uno/XComponentContext.hpp> namespace css = com::sun::star ; diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index aacef87396c4..aacef87396c4 100755..100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 77de429ed771..77de429ed771 100755..100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 4878f8d7783f..4878f8d7783f 100755..100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index e6aca26922da..edd70a5a7cd6 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -33,9 +33,7 @@ #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _RTL_URI_H_ #include <rtl/uri.hxx> -#endif #include "shellexec.hxx" #include <com/sun/star/system/SystemShellExecuteFlags.hpp> diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 7264afaac109..4bb3e780f1f9 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -35,9 +35,7 @@ #include "SysShExec.hxx" #include <osl/file.hxx> -#ifndef _COM_SUN_STAR_SYS_SHELL_SYSTEMSHELLEXECUTEFLAGS_HPP_ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> -#endif #define WIN32_LEAN_AND_MEAN #if defined _MSC_VER diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index e19dd68383b4..e19dd68383b4 100755..100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index adcf2b2f8ddf..adcf2b2f8ddf 100755..100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index e12f95a88e50..e12f95a88e50 100755..100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index a45c7967f233..682dda7d7eb5 100755..100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -30,9 +30,7 @@ #include "internal/config.hxx" #include "internal/global.hxx" -#ifndef PROPSEETS_HXX_INCLUDED #include "internal/propsheets.hxx" -#endif #include "internal/utilities.hxx" #include "internal/resource.h" #include "listviewbuilder.hxx" diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 6263c98ea749..6263c98ea749 100755..100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 13f49c8a2efd..2c42553ee243 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -30,9 +30,7 @@ #include "internal/global.hxx" -#ifndef INFOTIPS_HXX_INCLUDED #include "internal/thumbviewer.hxx" -#endif #include "internal/shlxthdl.hxx" #include "internal/registry.hxx" #include "internal/fileextensions.hxx" diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index c459408d3802..17f61e0d5f52 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSystemShellExecute.hpp> -#endif #include <cppuhelper/servicefactory.hxx> diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 82c522e1b0ff..c39a5ae74e5b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -50,12 +50,8 @@ #include <svx/dialmgr.hxx> #include "editeng/unolingu.hxx" -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef SVX_FRMSEL_HRC #include "frmsel.hrc" -#endif #ifndef MNEMONIC_CHAR #define MNEMONIC_CHAR ((sal_Unicode)'~') diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 28cdb8b0882b..adb67d0fddea 100755..100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -32,12 +32,8 @@ #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <rtl/uuid.h> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_STATE_TYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/XShapes.hpp> @@ -56,9 +52,7 @@ #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include "svdstr.hrc" #include <svx/dialmgr.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 89afa1ae073f..96bd292ea432 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/ChildrenManager.hxx> -#ifndef _SVX_ACCESSIBILITY_CHILDREN_MANAGER_IMPL_HXX #include "ChildrenManagerImpl.hxx" -#endif #include <svx/AccessibleShape.hxx> using namespace ::com::sun::star; diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 803388414451..fd12fc47ae59 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -31,9 +31,7 @@ #include "ChildrenManagerImpl.hxx" #include <svx/ShapeTypeHandler.hxx> #include <svx/AccessibleShapeInfo.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLESTATETYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/container/XChild.hpp> #include <comphelper/uno3.hxx> diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 010bc5decfeb..634c12737964 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -49,9 +49,7 @@ #include <com/sun/star/uno/Exception.hpp> // Includes for string resources. -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include "svdstr.hrc" #include <svx/dialmgr.hxx> #include <tools/string.hxx> diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index b0523bda67e1..c5c68fa2e947 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -52,12 +52,8 @@ #include <svx/AccessibleShapeInfo.hxx> #include "GraphCtlAccessibleContext.hxx" #include <svx/graphctl.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" -#endif #include <svx/svdpage.hxx> #include <svx/unomod.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 228f2ed50492..228f2ed50492 100755..100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 36490775cea1..bb5b8b3bc07f 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -35,9 +35,7 @@ #include <svx/svdocirc.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> -#ifndef _SVDOCAPT_HXX #include <svx/svdocapt.hxx> -#endif #include <svx/svdpage.hxx> #include <svx/xflclit.hxx> #include <svx/sdasaitm.hxx> @@ -59,12 +57,8 @@ #include <svx/xhatch.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> -#ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__ #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <basegfx/numeric/ftools.hxx> #include <basegfx/color/bcolortools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 237a0537d472..2a2538ba2755 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -34,9 +34,7 @@ #include "EnhancedCustomShapeHandle.hxx" #include "EnhancedCustomShapeGeometry.hxx" #include <svx/unoshape.hxx> -#ifndef _SVX_UNOPAGE_HXX #include "svx/unopage.hxx" -#endif #include "unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index b3c4645a58f9..9825f1d31626 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -30,9 +30,7 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 2eee0268816a..0c2f3942a66c 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -37,9 +37,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/miscopt.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #define _SDR_NOITEMS #define _SDR_NOTOUCH diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index fb7b4a6903ef..c151a7b2706a 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -36,9 +36,7 @@ // === includes (project) ================================================ #include <svx/svxdlg.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif //#include "connpooloptions.hxx" // === /includes (project) =============================================== diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 56873298382f..8cf0d8829901 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <svx/xtable.hxx> #include <svx/xpool.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index b4ee4dd2956f..8b9177a4a128 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -44,9 +44,7 @@ #include <rtl/ustrbuf.hxx> #include <vcl/scrbar.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif //#include "com/sun/star/lang/XMultiServiceFactory.hpp" #include <com/sun/star/task/XStatusIndicatorFactory.hpp> diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 16bc17976aa4..3df38d648d8d 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -35,12 +35,8 @@ #include "AccessibleFrameSelector.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef SVX_FRMSEL_HRC #include "frmsel.hrc" -#endif #include <tools/rcid.h> diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index a50bc6247a5f..aad6acf2fcf1 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -33,9 +33,7 @@ #include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/svapp.hxx> #include <osl/mutex.hxx> diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 4b427e403545..0fc0df86d99a 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -31,9 +31,7 @@ #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#ifndef _SFXOBJSH_HXX #include <sfx2/objsh.hxx> -#endif #include <sfx2/request.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index e876431b13ec..ce117cea36bb 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -39,13 +39,9 @@ #include <stdlib.h> #include <tools/shl.hxx> -#ifndef _EINF_HXX #include <tools/errinf.hxx> -#endif #include <tools/urlobj.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> @@ -63,9 +59,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #define _IMAPDLG_PRIVATE #include "imapdlg.hxx" diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index f546bb95dc21..37c045651d16 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -32,9 +32,7 @@ #include <vector> #include <utility> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include "dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 19d97d368496..9f09bca1f2b8 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #define _SVX_PASSWD_CXX diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 07f4d2fe9928..1688f1771bc8 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 5a5839443170..4269fbdb5cbb 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -47,9 +47,7 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <svtools/colorcfg.hxx> using namespace com::sun::star::uno; diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index ab5533513000..283a8f536595 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -33,9 +33,7 @@ #include <svx/simptabl.hxx> #include <vcl/svapp.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/intlwrapper.hxx> // SvxSimpTblContainer ------------------------------------------------------ diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 0cd6421f5a77..b7b2e34e9ce8 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svx/stddlg.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index cbf5a39997bd..dc2c9d046a32 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -28,16 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> #include <svl/languageoptions.hxx> -#ifndef _SVX_HELPID_HRC #include <helpid.hrc> -#endif #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 3aa4e9d235df..cb88d2c3fce1 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -52,9 +52,7 @@ #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif #ifndef RULER_TAB_RTL #define RULER_TAB_RTL ((USHORT)0x0010) #endif diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 0a6e36219ed3..dbe91f2c88dc 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -33,16 +33,12 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <tools/urlobj.hxx> //........................................................................ diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index a9c3cf05e1f2..2e3bd32d59fc 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -32,16 +32,12 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif //........................................................................ namespace svx diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 1944bd47dad5..2455233a951f 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -28,18 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <svx/gridctrl.hxx> #include "gridcell.hxx" #include "svx/dbtoolsclient.hxx" #include "svx/fmtools.hxx" #include <svtools/stringtransfer.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <svtools/stringtransfer.hxx> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -60,13 +56,9 @@ #include <vcl/sound.hxx> #include <vcl/menu.hxx> -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 28d016e1e146..cd972ea8bafb 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_FMCONTROLBORDERMANAGER_HXX #include "fmcontrolbordermanager.hxx" -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index d1ffbc7c0dbe..787081a01c71 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX #include "fmdocumentclassification.hxx" -#endif #include "svx/dbtoolsclient.hxx" /** === begin UNO includes === **/ diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c50dcb398928..5ec71e4535a0 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -32,9 +32,7 @@ #include <sot/storage.hxx> #include <svl/itempool.hxx> -#ifndef _SVX_DBEXCH_HRC #include <dbexch.hrc> -#endif #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..8ce58a1681ec 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -28,17 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif -#ifndef _SVX_FMEXPL_HRC #include "fmexpl.hrc" -#endif #include "fmexpl.hxx" -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <svx/fmglob.hxx> #include "fmservs.hxx" #include <svx/fmmodel.hxx> @@ -46,13 +40,9 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include <svx/dialmgr.hxx> #include "svditer.hxx" #include <svx/svdouno.hxx> @@ -71,9 +61,7 @@ #include <sfx2/request.hxx> #include <tools/shl.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <vcl/sound.hxx> #include <svx/fmshell.hxx> #include "fmshimp.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index ca96a9957ba7..bdf696562597 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -32,32 +32,20 @@ #include "svx/fmtools.hxx" #include "fmservs.hxx" -#ifndef _FM_FMOBJFAC_HXX #include "fmobjfac.hxx" -#endif -#ifndef _FM_FMGLOB_HXX #include <svx/fmglob.hxx> -#endif -#ifndef _FM_FMOBJ_HXX #include "fmobj.hxx" -#endif #include "fmshimp.hxx" -#ifndef _FM_FMSHELL_HXX #include <svx/fmshell.hxx> -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "tbxform.hxx" #include <tools/resid.hxx> -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" @@ -65,9 +53,7 @@ #include "fmexpl.hxx" #include "filtnav.hxx" -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmPropBrw.hxx" #include "datanavi.hxx" diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 0a5c7da9ea3c..307dcb711b7c 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -37,30 +37,22 @@ #include <svx/fmmodel.hxx> #ifndef SVX_LIGHT -#ifndef _SVX_FMOBJ_HXX #include "fmobj.hxx" #endif -#endif #ifndef SVX_LIGHT -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" #endif -#endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #ifndef SVX_LIGHT -#ifndef _SVX_FMPGEIMP_HXX #include "fmpgeimp.hxx" #endif -#endif #ifndef SVX_LIGHT -#ifndef _SFX_OBJSH_HXX //autogen #include <sfx2/objsh.hxx> #endif -#endif #include "svditer.hxx" #include <svx/svdview.hxx> #include <tools/urlobj.hxx> @@ -68,12 +60,8 @@ #ifndef SVX_LIGHT -#ifndef _SVX_FMGLOB_HXX #include <svx/fmglob.hxx> -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmundo.hxx" #include "svx/fmtools.hxx" using namespace ::svxform; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 96bdd27d62e1..d664ea7c8bdc 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -31,18 +31,14 @@ #include <svx/fmshell.hxx> #include "svx/fmtools.hxx" #include "fmservs.hxx" -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmpgeimp.hxx" #include "fmitems.hxx" #include "fmundo.hxx" #include <vcl/waitobj.hxx> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/container/XNamed.hpp> -#ifndef _COM_SUN_STAR_SDDB_PRIVILEGE_HPP_ #include <com/sun/star/sdbcx/Privilege.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> @@ -67,13 +63,9 @@ #include "svditer.hxx" #include "fmobj.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif #include "fmexch.hxx" #include <svx/fmglob.hxx> #include <svl/eitem.hxx> @@ -125,9 +117,7 @@ #define FmFormShell #include "svxslots.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "tbxform.hxx" #include <comphelper/property.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index a4bb5753e8bb..980c3ae34adc 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif #include "svx/fmtools.hxx" #include "fmsrccfg.hxx" #include <tools/debug.hxx> @@ -50,18 +48,14 @@ #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> -#ifndef _COM_SUN_STAR_SDDB_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <comphelper/processfactory.hxx> -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif #include "fmservs.hxx" #include "fmsrcimp.hxx" #include <svx/fmsearch.hxx> diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c10bdfe14ec5..1d60c5b4652a 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -29,9 +29,7 @@ #include "precompiled_svx.hxx" #include "fmtextcontroldialogs.hxx" #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #ifndef _SVX_CHARDLG_HXX //#include "chardlg.hxx" diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index b98e63fb2bd1..0cf8c54f02cc 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> /** === end UNO includes === **/ -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif //........................................................................ namespace svxform diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index bce51d8d43f5..cbe886fc65ad 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -44,25 +44,17 @@ #include <comphelper/processfactory.hxx> #include <comphelper/stl_types.hxx> -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <svx/fmshell.hxx> #include "fmshimp.hxx" #include "svx/dbtoolsclient.hxx" #include <svx/fmpage.hxx> -#ifndef _SVX_FMPGEIMP_HXX #include "fmpgeimp.hxx" -#endif -#ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" -#endif -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif #include <svx/dialmgr.hxx> #include <tools/shl.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..27495262b0ea 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -42,19 +42,13 @@ #include <vcl/sound.hxx> #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "tbxctl.hxx" #include "tbxdraw.hxx" #include "tbxform.hxx" -#ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" -#endif #include "fmitems.hxx" -#ifndef _SVX_FMHELP_HRC #include "fmhelp.hrc" -#endif #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/imagemgr.hxx> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index f465e9d88dad..80189e02842f 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -37,9 +37,7 @@ #include <editeng/cntritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> -#ifndef _SVX_CLIPBOARDCTL_HXX_ #include "clipfmtitem.hxx" -#endif #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" #include <editeng/charreliefitem.hxx> @@ -55,9 +53,7 @@ #include <editeng/kernitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/adjitem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <editeng/memberids.hrc> #define SFX_TYPEMAP diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 078e555cfe25..20d02422344d 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef SVX_SOURCE_FORM_XFM_ADDCONDITION_HXX #include "xfm_addcondition.hxx" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index ce1d1952761b..0962f2146e46 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -32,9 +32,7 @@ #include <svx/SmartTagItem.hxx> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif //#include <svl/memberid.hrc> diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index ce793ee721d7..a8f1bbfceae2 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- #include <tools/stream.hxx> -#ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> -#endif #if defined UNX && !defined LINUX #include <wchar.h> #endif diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index c8c634c36a91..ca67b286ddf0 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -31,18 +31,12 @@ // include --------------------------------------------------------------- #define _SVX_HLNKITEM_CXX -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/stream.hxx> -#ifndef _MEMBERID_HRC #include <svx/memberid.hrc> -#endif -#ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> -#endif #include "hlnkitem.hxx" diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx index 9b3050966c73..856e568c91bd 100644 --- a/svx/source/items/zoomitem.cxx +++ b/svx/source/items/zoomitem.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/stream.hxx> -#ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> -#endif #include <svx/zoomitem.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 6833117a1335..35e45c4be743 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -30,15 +30,11 @@ #include <svx/SmartTagCtl.hxx> #include <com/sun/star/smarttags/XSmartTagAction.hpp> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <svtools/stdmenu.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/SmartTagItem.hxx> diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 241ffeb8bc36..61922c8b8237 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index edb72ab05eac..e432050e534c 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -57,9 +57,7 @@ #include <svx/dialogs.hrc> #include <unotools/localedatawrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 980216ce17bf..276c46c4f17a 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -30,9 +30,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 06d1e9642b9e..81b4b05eded7 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -30,12 +30,8 @@ // include --------------------------------------------------------------- #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> //#ifndef _SFXITEMPOOL_HXX //#include <svl/itempool.hxx> @@ -65,12 +61,8 @@ //#include <svx/dialogs.hrc> -/*#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX -#include <unotools/localedatawrapper.hxx> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX +/*#include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#endif*/ diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 63cbbb969d2d..d53884fd8e04 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 729538f707c7..41d0609bf043 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -30,12 +30,8 @@ // include --------------------------------------------------------------- #include <svx/zoomsliderctrl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> #include <svx/zoomslideritem.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 998c687608fc..998c687608fc 100755..100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa5ddd579dee..d259b3f9c462 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -30,12 +30,8 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/msgbox.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index d61001738bad..5d80aeedd0ae 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -47,9 +47,7 @@ #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> #include <lboxctrl.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 9ea2e7736898..cac2cfebf0d3 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -32,9 +32,7 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 3d9d6881eec7..5035702e5912 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -36,9 +36,7 @@ #include "tbxdraw.hxx" #include "tbxdraw.hrc" #include <tools/shl.hxx> -#ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> -#endif #include <vcl/svapp.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 3005289268b9..cc0e204f6636 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#ifndef _COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPEPARAMETERPARIR_HPP_ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#endif #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/Position3D.hpp> @@ -45,9 +43,7 @@ #include <svx/xsflclit.hxx> #include <svx/dialmgr.hxx> #include <svx/svdoashp.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/svdview.hxx> #include <editeng/colritem.hxx> #include "chrtitem.hxx" diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 777aead3fa1a..5ce8236eedd1 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <svx/dialmgr.hxx> #include <svx/svdoashp.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/svdview.hxx> #include <svx/sdasitm.hxx> #include <svx/svdoashp.hxx> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index dda324cb98d1..916d884ab81c 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -48,14 +48,10 @@ #include <unotools/linguprops.hxx> // header for class IntlWrapper #include <unotools/intlwrapper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif // header for class Application #include <vcl/svapp.hxx> -#ifndef _SVX_HELPID_HRC #include "helpid.hrc" -#endif //disable compiler warning C4355: 'this' : used in base member initializer list #ifdef _MSC_VER diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 213ddc22bace..9ee437bd2456 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -38,9 +38,7 @@ // header for class SvtLinguConfigItem #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> -#ifndef _SVX_HELPID_HRC #include "helpid.hrc" -#endif //disable compiler warning C4355: 'this' : used in base member initializer list #ifdef _MSC_VER diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 5c7ad5226aff..79432555aef5 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -34,9 +34,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 1f2d4fd3145b..63392b984c2d 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1621,9 +1621,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic #include <vcl/cvtgrf.hxx> #include <svx/svdograf.hxx> #ifndef SVX_LIGHT -#ifndef _SFXDOCFILE_HXX #include <sfx2/docfile.hxx> -#endif #include <sfx2/app.hxx> #include <sfx2/fcontnr.hxx> #endif diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 96804103f610..dd54c88f58b0 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -39,9 +39,7 @@ #include <svx/svdomedia.hxx> #include <svx/svdpool.hxx> #ifndef SVX_LIGHT -#ifndef _SOT_CLSIDS_HXX #include <sot/clsids.hxx> -#endif #include <sfx2/frmdescr.hxx> #endif #include <vcl/svapp.hxx> diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index e2596eba84ec..8007be44a4f2 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -38,9 +38,7 @@ #include <svx/fmmodel.hxx> #include <rtl/uuid.h> #include <vos/mutex.hxx> -#ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> -#endif #include <unotools/pathoptions.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index d6204da54eb8..b7578c2bd6db 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -33,9 +33,7 @@ #include "svx/gallery1.hxx" #include <rtl/uuid.h> #include <vos/mutex.hxx> -#ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> -#endif #include <unotools/pathoptions.hxx> #include <com/sun/star/gallery/XGalleryTheme.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index ff161c0a1b2b..49b92e5d3737 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/embed/XEmbedObjectFactory.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#ifndef _COM_SUN_STAR_EMBED_XEMBED_PERSIST_HPP_ #include <com/sun/star/embed/XEmbedPersist.hpp> -#endif #include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/Aspects.hpp> @@ -52,9 +50,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/embeddedobjectcontainer.hxx> -#ifndef _SO_CLSIDS_HXX #include <sot/clsids.hxx> -#endif #include <map> #include "xmleohlp.hxx" diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index bda709dc4abd..f0024052be98 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/embed/XTransactedObject.hpp> -#ifndef _COM_SUN_STAR_EMBED_ElementModes_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index eec20c0fe80c..5a19a562c48a 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -34,13 +34,9 @@ #include <tools/vcompat.hxx> #include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> -#ifndef _SFXIPOOL_HXX #include <svl/itempool.hxx> -#endif #include <svl/whiter.hxx> -#ifndef _SFXIPOOL_HXX #include <svl/itempool.hxx> -#endif #include <svl/itemset.hxx> #include <svx/xdef.hxx> #include "xexch.hxx" diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 54d359506f77..9e23bba8fc18 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -43,9 +43,7 @@ #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif #include <svl/itemset.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index baee57ad75dc..7067b13d6e81 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -33,9 +33,7 @@ #include <algorithm> #include <boost/shared_ptr.hpp> #include <sot/storage.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #include <sal/main.h> #include <vcl/event.hxx> diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index b78e5d6e4890..83b808a7a594 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -33,9 +33,7 @@ #include "osl/diagnose.h" #include <com/sun/star/ucb/OpenMode.hpp> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> @@ -51,9 +49,7 @@ #include "filrow.hxx" #include "bc.hxx" #include "prov.hxx" -#ifndef _FILERROR_HXX_ #include "filerror.hxx" -#endif #include "filinsreq.hxx" diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index e947c68da1ba..6978ece770b7 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -29,9 +29,7 @@ #include "precompiled_ucb.hxx" #include <stdio.h> #include "filglob.hxx" -#ifndef _FILERROR_HXX_ #include "filerror.hxx" -#endif #include "shell.hxx" #include "bc.hxx" #include <osl/file.hxx> diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index a66a0daf5def..6ad6441862dd 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" #include "filinpstr.hxx" -#ifndef _FILERROR_HXX_ #include "filerror.hxx" -#endif #include "shell.hxx" #include "prov.hxx" diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 5dcdd8445556..f333646f0d9b 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -36,9 +36,7 @@ #include "prov.hxx" #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/ucb/ListActionType.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.hpp> diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index a456d2acbd32..67db8af2b9cd 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -32,9 +32,7 @@ #include <osl/socket.h> #include <cppuhelper/factory.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/ucb/FileSystemNotation.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include "filglob.hxx" diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index 93f274f1ac5f..8bc8a7a616ac 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> -#ifndef _FTP_FTPDYNRESULTSET_HXX_ #include "ftpdynresultset.hxx" -#endif #include "ftpresultsetfactory.hxx" using namespace com::sun::star::lang; diff --git a/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx index 5fe5c829f976..1f13453caf6f 100644 --- a/ucb/source/ucp/ftp/ftpinpstr.cxx +++ b/ucb/source/ucp/ftp/ftpinpstr.cxx @@ -34,9 +34,7 @@ *************************************************************************/ #include "ftpinpstr.hxx" -#ifndef _RTL_ALLOC_H #include <rtl/alloc.h> -#endif #ifndef STD_ALGORITHM #include <algorithm> #define STD_ALGORITHM diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index c83a34e251e8..2e9c57d8bf59 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -30,9 +30,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/ucb/ListActionType.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <ucbhelper/resultsetmetadata.hxx> diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx index 5265dc530be9..a6bdf60c4443 100644 --- a/ucb/source/ucp/ftp/test_activedatasink.cxx +++ b/ucb/source/ucp/ftp/test_activedatasink.cxx @@ -34,9 +34,7 @@ *************************************************************************/ -#ifndef _TEST_ACTIVEDATASINK_HXX_ #include "test_activedatasink.hxx" -#endif using namespace test_ftp; diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index 8e623c630aa8..8e623c630aa8 100755..100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index d2e8f5031527..710961e5e075 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -46,9 +46,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#ifndef _COM_SUN_STAR_UTIL_XOFFICEINSTALLTIONDIRECTORIES_HPP_ #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> -#endif #include "hierarchyprovider.hxx" #include "hierarchyuri.hxx" diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx index 39d8d9cecc38..6ddd6c544e60 100644 --- a/ucb/source/ucp/webdav/LinkSequence.cxx +++ b/ucb/source/ucp/webdav/LinkSequence.cxx @@ -31,9 +31,7 @@ #include <string.h> #include <ne_xml.h> -#ifndef _LINKSEQUENCE_HXX_ #include "LinkSequence.hxx" -#endif using namespace webdav_ucp; using namespace com::sun::star; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 8d2683939f0d..cdabeb271e69 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -40,9 +40,7 @@ #include "webdavdatasupplier.hxx" #include "webdavcontent.hxx" #include "ContentProperties.hxx" -#ifndef _WEBDAV_SESSION_HXX #include "DAVSession.hxx" -#endif #include "NeonUri.hxx" using namespace com::sun::star; diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx index cf4cc88fd12f..a2894140f27c 100644 --- a/ucb/source/ucp/webdav/webdavresultset.cxx +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -37,9 +37,7 @@ *************************************************************************/ #include "webdavresultset.hxx" -#ifndef _WEBDAV_SESSION_HXX #include "DAVSession.hxx" -#endif using namespace com::sun::star; using namespace webdav_ucp; diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx index 25f10f3318b1..bfe782fc9e0b 100644 --- a/ucb/workben/cachemap/cachemaptest.cxx +++ b/ucb/workben/cachemap/cachemaptest.cxx @@ -32,9 +32,7 @@ #include "cachemapobject3.hxx" #include "cachemapobjectcontainer2.hxx" -#ifndef _SOL_TIME_H_ #include "osl/time.h" -#endif #include "rtl/ref.hxx" #include "rtl/ustring.hxx" diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx index 92b6dd188791..987956ee9fc4 100644 --- a/ucb/workben/ucb/srcharg.cxx +++ b/ucb/workben/ucb/srcharg.cxx @@ -36,9 +36,7 @@ #include <tools/inetmime.hxx> #include <tools/string.hxx> -#ifndef CHAOS_UCBDEMO_SRCHARG_HXX #include <srcharg.hxx> -#endif namespace unnamed_chaos_ucbdemo_srcharg {} using namespace unnamed_chaos_ucbdemo_srcharg; diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx index a806ff4e59e8..a2f489955969 100644 --- a/uui/source/cookiedg.cxx +++ b/uui/source/cookiedg.cxx @@ -29,13 +29,9 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_COOKIEDG_HRC #include <cookiedg.hrc> -#endif #include <cookiedg.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif // CookiesDialog --------------------------------------------------------- diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 4bda9fb9e579..351d7683ca26 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -31,13 +31,9 @@ #include "fltdlg.hxx" -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif -#ifndef UUI_FLTDLG_HRC #include "fltdlg.hrc" -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -48,9 +44,7 @@ #include <tools/list.hxx> #include <tools/urlobj.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vos/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 0879e3574da3..0879e3574da3 100755..100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index d7ded58b5dde..444922b110c5 100755..100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -29,12 +29,8 @@ #include <vcl/msgbox.hxx> #include "logindlg.hxx" -#ifndef UUI_LOGINDLG_HRC #include "logindlg.hrc" -#endif -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif #include <tools/resid.hxx> #ifdef UNX diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index af2ef194f22e..495df78d4136 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -28,12 +28,8 @@ #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSCRTDLG_HRC #include <masterpasscrtdlg.hrc> -#endif #include <masterpasscrtdlg.hxx> // MasterPasswordCreateDialog--------------------------------------------------- diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index a5e35eaf755b..a0e61e1dc11d 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -28,12 +28,8 @@ #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSWORDDLG_HRC #include <masterpassworddlg.hrc> -#endif #include <masterpassworddlg.hxx> // MasterPasswordDialog--------------------------------------------------- diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx index 1fc6024bcd19..cfa11c8607b6 100644 --- a/uui/source/passcrtdlg.cxx +++ b/uui/source/passcrtdlg.cxx @@ -28,12 +28,8 @@ #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_PASSCRTDLG_HRC #include <passcrtdlg.hrc> -#endif #include <passcrtdlg.hxx> // PasswordCreateDialog--------------------------------------------------- diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index c89184f54bc1..a6716c0baa0e 100755..100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -28,12 +28,8 @@ #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_PASSWORDDLG_HRC #include <passworddlg.hrc> -#endif #include <passworddlg.hxx> // PasswordDialog--------------------------------------------------------- diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index bed776e7f3de..48b4facb3c1e 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -27,15 +27,9 @@ #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HRC #include <sslwarndlg.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HXX #include <sslwarndlg.hxx> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 3a58d69842ea..c12a0e0ad756 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -27,15 +27,9 @@ #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HRC #include <unknownauthdlg.hrc> -#endif -#ifndef UUI_UNKNOWNAUTHDLG_HXX #include <unknownauthdlg.hxx> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index ed2fc70164ac..ed2fc70164ac 100755..100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 16a8671df601..16a8671df601 100755..100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index bbc39590547e..a84ce946489a 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -45,14 +45,10 @@ #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> -#ifndef _UCBHELPER_CANCELCOMMANDEXECUTION_HXX #include <ucbhelper/cancelcommandexecution.hxx> -#endif #include "content.hxx" #include "provider.hxx" #include "resultset.hxx" diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index f1113c1e114f..9197f6725229 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmlhelp.hxx" #include "db.hxx" -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include <osl/thread.h> #include <rtl/uri.hxx> #include <osl/file.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index c21b5aca3ba5..271b7acb99af 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -36,14 +36,10 @@ #include <stdio.h> #include <osl/file.hxx> -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/frame/XConfigManager.hpp> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index fde45bbfc7a9..6da9313a44d6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -30,9 +30,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/ucb/ListActionType.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <ucbhelper/resultsetmetadata.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 67735c4e0a6a..69205f08203e 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -35,9 +35,7 @@ #endif #include <string.h> -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include <osl/thread.h> #include <rtl/memory.h> #include <osl/file.hxx> diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 73c413394763..aa733e1a69e3 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -31,9 +31,7 @@ #include <string.h> #include <rtl/ustrbuf.hxx> -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include "tvread.hxx" #include <expat.h> #include <osl/file.hxx> diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index f66fd3fd8561..f66fd3fd8561 100755..100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 884acb473108..884acb473108 100755..100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index 56fa7ac049fd..e7976dda0d1d 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -37,9 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase3.hxx> -#endif class SvXMLAttrContainerItem_Impl; diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index b541fd2c3057..78a0e619fd14 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -31,9 +31,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif #include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx index e50e180b089a..0aebb8ba7976 100644 --- a/xmloff/source/core/xmlehelp.cxx +++ b/xmloff/source/core/xmlehelp.cxx @@ -33,9 +33,7 @@ #include <rtl/ustrbuf.hxx> #include "xmlehelp.hxx" -#ifndef _XMLOFF_XMTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 4b8bcf429057..d559c7144947 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -34,9 +34,7 @@ #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include "XMLShapePropertySetContext.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 81c962b1be9e..fbb372a2296e 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -31,17 +31,13 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP #include <com/sun/star/beans/XPropertySetInfo.hpp> -#endif #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif #include <com/sun/star/awt/Rectangle.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 01d14ecab54e..cf2e74f283cc 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index e1c94dcf5cc7..2a0d18b7ec4f 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX_ #include "XMLShapePropertySetContext.hxx" -#endif #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> #include "xmltabi.hxx" diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 596bfff3a4a9..167d7cc35b7d 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/drawing/RectanglePoint.hpp> #include <com/sun/star/drawing/CircleKind.hpp> -#ifndef _COM_SUN_STAR_DRAWING_BitmapMode_HPP_ #include <com/sun/star/drawing/BitmapMode.hpp> -#endif #include <com/sun/star/text/WritingMode.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/NamedBoolPropertyHdl.hxx> diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 862326495a70..9908bc3d724e 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -68,9 +68,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include "xexptran.hxx" -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif #include <comphelper/extract.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include "PropertySetMerger.hxx" diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 76942cf817db..4b65dafadaa8 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -30,15 +30,11 @@ #include <tools/string.hxx> -#ifndef _XMLOFF_XMLMETAI_HXX #include <xmloff/xmlscripti.hxx> -#endif #include "sdxmlimp_impl.hxx" #include "ximpbody.hxx" -#ifndef _SFX_XMLMETAI_HXX #include <xmloff/xmlmetai.hxx> -#endif #include "ximpstyl.hxx" #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index d13b5e24e2db..8920d5ca9183 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -40,9 +40,7 @@ #include <com/sun/star/media/ZoomLevel.hpp> #include "anim.hxx" -#ifndef _XMLOFF_SHAPEEXPORT_HXX #include <xmloff/shapeexport.hxx> -#endif #include "sdpropls.hxx" #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 559f94f6d51f..3f3fa2284fa5 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/drawing/DoubleSequence.hpp> #include <tools/gen.hxx> -#ifndef _XMLOFF_SHAPEEXPORT_HXX #include <xmloff/shapeexport.hxx> -#endif #include "sdpropls.hxx" #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 3f52fcd50084..6b81ba49272d 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -44,9 +44,7 @@ #include <com/sun/star/table/XColumnRowRange.hpp> -#ifndef _XMLOFF_SHAPEEXPORT_HXX #include <xmloff/shapeexport.hxx> -#endif #include "sdpropls.hxx" #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> @@ -58,9 +56,7 @@ #include <com/sun/star/container/XIdentifierContainer.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> -#ifndef _COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPEPARAMETERPARI_HPP_ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#endif #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 903b7d99809a..452331b2ea70 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -37,9 +37,7 @@ #include <list> -#ifndef _XMLOFF_SHAPEIMPORT_HXX #include <xmloff/shapeimport.hxx> -#endif #include <xmloff/xmltkmap.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx index 00a745660710..64892edd578f 100644 --- a/xmloff/source/forms/formsimp.cxx +++ b/xmloff/source/forms/formsimp.cxx @@ -32,9 +32,7 @@ #include "xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> -#ifndef _XMLOFF_ANIMIMP_HXX #include <xmloff/formsimp.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 772d5907bd91..7e3f9958e439 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -34,9 +34,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP #include <com/sun/star/uno/Exception.hpp> -#endif #include <com/sun/star/beans/PropertyAttribute.hpp> // #110680# diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index f126fd566e94..ddc6578697e8 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -29,17 +29,11 @@ #include "precompiled_xmloff.hxx" #include <xmloff/XMLEventExport.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEREPLACE_HPP #include <com/sun/star/container/XNameReplace.hpp> -#endif #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index cdd2906760a0..d91a6e0dda30 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_XMLEVENTIMPORTHELPER_HXX #include "XMLEventImportHelper.hxx" -#endif #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index b22cd6262558..6a8abdaddb4e 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -29,13 +29,9 @@ #include "precompiled_xmloff.hxx" #include <xmloff/XMLEventsImportContext.hxx> -#ifndef _XMLOFF_XMLEVENTIMPORTHELPER_HXX #include "XMLEventImportHelper.hxx" -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif #include <tools/debug.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index e04467d1e491..561d22f94815 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "XMLScriptExportHandler.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index ee945f4a74cc..ec045a2389bf 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "XMLStarBasicExportHandler.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index 301d1668505f..2ec7fd62bde6 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_MULTIPROPERTYSETHELPER_HXX #include "MultiPropertySetHelper.hxx" -#endif #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 571c001d00de..90dbb5e4d649 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -33,9 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX #include "PageHeaderFooterContext.hxx" -#endif #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index fe14231e51c4..3f379bba32ca 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -31,9 +31,7 @@ #include <xmloff/xmltoken.hxx> #include <comphelper/types.hxx> #include <com/sun/star/table/BorderLine.hpp> -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/extract.hxx> diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index e784e4f5085f..11ea4f3a1082 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -34,16 +34,10 @@ #include <xmloff/xmltoken.hxx> #include "PageMasterPropHdl.hxx" #include "PagePropertySetContext.hxx" -#ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX #include "PageHeaderFooterContext.hxx" -#endif -#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX #include "PageMasterPropMapper.hxx" -#endif #include "PageMasterImportPropMapper.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index 01b27576ec19..5edec583e109 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -30,12 +30,8 @@ #include "PageMasterImportPropMapper.hxx" -#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX #include "PageMasterPropMapper.hxx" -#endif -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <xmloff/maptype.hxx> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 2888f87e8f7e..5d22bdab5e24 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -32,14 +32,10 @@ #include <xmloff/xmltoken.hxx> #include "xmlbahdl.hxx" #include <xmloff/NamedBoolPropertyHdl.hxx> -#ifndef _XMLOFF_XMLTEXTCOLUMNSPPROPERTYHANDLER_HXX #include "XMLTextColumnsPropertyHandler.hxx" -#endif #include <xmloff/XMLConstantsPropertyHandler.hxx> #include "PageMasterPropHdl.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <com/sun/star/text/TextGridMode.hpp> diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index cf27923288c3..c81a4967a899 100644 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx @@ -28,14 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX #include "PageMasterPropMapper.hxx" -#endif -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include "PageMasterPropHdlFactory.hxx" using namespace ::com::sun::star; diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 99065c9d3481..4cd9f73063a8 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index f65cc7689dc0..dbba6e76198c 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -31,9 +31,7 @@ #include "PagePropertySetContext.hxx" #include "XMLBackgroundImageContext.hxx" #include "XMLTextColumnsContext.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include "XMLFootnoteSeparatorImport.hxx" using ::rtl::OUString; diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx index 896c4e9fecef..a9cdc48a7ba3 100644 --- a/xmloff/source/style/SinglePropertySetInfoCache.cxx +++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx @@ -30,9 +30,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weakref.hxx> -#ifndef _XMLOFF_SINGLEPROPERTYSETINFOCACHE_HXX #include <xmloff/SinglePropertySetInfoCache.hxx> -#endif using namespace ::com::sun::star::uno; using ::com::sun::star::lang::XTypeProvider; diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 42d4e2cec221..5432bf53c439 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -35,9 +35,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprmap.hxx> -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <com/sun/star/text/HorizontalAdjust.hpp> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 33fb40fbfc3a..1d782bdca299 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -43,9 +43,7 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/maptype.hxx> -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include <tools/debug.hxx> #include <tools/color.hxx> diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index bc5bdaf6d69f..1b75f775ce9b 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -39,12 +39,8 @@ #include <xmloff/families.hxx> #include <xmloff/xmlexp.hxx> #include "PageMasterPropHdlFactory.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif -#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX #include "PageMasterPropMapper.hxx" -#endif #include "PageMasterExportPropMapper.hxx" #include "PageMasterExportPropMapper.hxx" diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index af3f36d8b4d1..9685d0595f33 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -37,9 +37,7 @@ #include <xmloff/xmlexppr.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/families.hxx> -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif using namespace ::std; using ::rtl::OUString; diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 3eb2ddb71a8d..097606815dc8 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -45,9 +45,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmloff/xmlimp.hxx> -#ifndef _XMLOFF_PRSTYLEI_HXX #include <xmloff/prstylei.hxx> -#endif #include <xmloff/attrlist.hxx> #include "xmlerror.hxx" diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index cb666d899fb7..c1c3d85629a9 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -49,14 +49,10 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include <xmloff/xmlaustp.hxx> -#ifndef _XMLOFF_STYLEEXP_HXX #include <xmloff/styleexp.hxx> -#endif #include <xmloff/xmlexp.hxx> #include <xmloff/XMLEventExport.hxx> diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index c30f7c631a71..467a0f32504a 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -39,9 +39,7 @@ #include <xmloff/xmlexp.hxx> #include "XMLTextListAutoStylePool.hxx" -#ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> -#endif #include "PageMasterExportPropMapper.hxx" #include "XMLBackgroundImageExport.hxx" diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 48779f48f583..7d2ac7834309 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -38,9 +38,7 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XAutoStylesSupplier.hpp> #include <com/sun/star/style/XAutoStyleFamily.hpp> -#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX #include "PageMasterPropMapper.hxx" -#endif #include <tools/debug.hxx> #include <tools/list.hxx> #include <svl/cntnrsrt.hxx> @@ -49,19 +47,13 @@ #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlstyle.hxx> -#ifndef _XMLOFF_TXTSTYLI_HXX #include <xmloff/txtstyli.hxx> -#endif -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #include <xmloff/xmlnumfi.hxx> #include "XMLChartStyleContext.hxx" #include "XMLChartPropertySetMapper.hxx" diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 125d0a63c43c..5185b9bce055 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP #include <com/sun/star/uno/Exception.hpp> -#endif // #110680# //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 9f2877fd9e12..4f4f4c764b9b 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -38,9 +38,7 @@ #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 4942fd8d1beb..351c581777cd 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexReplace.hpp> -#ifndef _COM_SUN_STAR_TEXT_REFERENCEFIELD_PART_HPP #include <com/sun/star/text/ReferenceFieldPart.hpp> -#endif #include "XMLIndexTemplateContext.hxx" #include "XMLIndexTitleTemplateContext.hxx" #include "XMLIndexTOCStylesContext.hxx" diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 9ec1adfb75eb..46e46ab1f53a 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/style/NumberingType.hpp> #include <xmloff/maptype.hxx> -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 9fcd63290e10..2ea1d3cfa86f 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -32,9 +32,7 @@ #include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" #include "XMLTextHeaderFooterContext.hxx" -#ifndef _XMLOFF_TEXTTABLECONTEXT_HXX_ #include <xmloff/XMLTextTableContext.hxx> -#endif #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index f66f5df75d37..0f8f1c7023f0 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -35,12 +35,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include <xmloff/XMLTextMasterPageContext.hxx> -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include <xmloff/XMLTextMasterStylesContext.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 31c5777f4d57..553ac2ed8254 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -33,13 +33,9 @@ #include "XMLBackgroundImageContext.hxx" #include "XMLSectionFootnoteConfigImport.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #include "xmltabi.hxx" -#ifndef _XMLOFF_TXTDROPI_HXX #include "txtdropi.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index e398effbf44c..a03ff38a4db0 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <com/sun/star/text/XTextContent.hpp> -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _XMLOFF_XMLTIMP_HXX_ #include <xmloff/xmlimp.hxx> -#endif #include <xmloff/txtimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 092f8720c6ec..f828cdcabca5 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> -#endif #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "XMLTextPropertySetContext.hxx" @@ -39,13 +37,9 @@ #include "XMLShapePropertySetContext.hxx" #include "XMLTextColumnsContext.hxx" #include "XMLBackgroundImageContext.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif -#ifndef _XMLOFF_XMLTEXTSHAPESTYLECONTEXT_HXX #include <xmloff/XMLTextShapeStyleContext.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 07f0bcb52576..7b3c7e828683 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -32,18 +32,10 @@ #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTFAMILY_HPP #include <com/sun/star/awt/FontFamily.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTPITCH_HPP #include <com/sun/star/awt/FontPitch.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP #include <com/sun/star/awt/FontUnderline.hpp> -#endif #include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include "txtexppr.hxx" #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 9940046b81c1..b2beff4040f1 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -60,9 +60,7 @@ #include <xmloff/xmlnume.hxx> #include "XMLTextCharStyleNamesElementExport.hxx" #include <xmloff/XMLEventExport.hxx> -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 3a26fe37c794..8e10306aad20 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -48,13 +48,9 @@ #include "XMLAnchorTypePropHdl.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> #include "XMLClipPropertyHandler.hxx" -#ifndef _XMLOFF_XMLTEXTCOLUMNSPPROPERTYHANDLER_HXX #include "XMLTextColumnsPropertyHandler.hxx" -#endif #include <xmloff/NamedBoolPropertyHdl.hxx> -#ifndef _XMLOFF_TXTPRHDL_HXX #include "txtprhdl.hxx" -#endif // OD 2004-05-05 #i28701# #include <com/sun/star/text/WrapInfluenceOnPosition.hpp> diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index a14b64e05d90..0c44e9ff5746 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -30,12 +30,8 @@ #include <tools/debug.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_TXTPRHDL_HXX #include "txtprhdl.hxx" -#endif -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 74e6fc706f6b..a52a65ed6382 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif #include <tools/debug.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -59,9 +57,7 @@ #include "XMLTextNumRuleInfo.hxx" #include "XMLSectionExport.hxx" #include "XMLRedlineExport.hxx" -#ifndef _XMLOFF_MULTIPROPERTYSETHELPER_HXX #include "MultiPropertySetHelper.hxx" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index eb4e59f2dd16..fec54cd782fc 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -43,28 +43,18 @@ #ifndef _XMLOFF_PROPERTYSETMAPPER_HXX //#include <xmloff/xmlprmap.hxx> #endif -#ifndef _XMLOFF_XMLSMSPE_HXX #include "xmlnmspe.hxx" -#endif -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #ifndef _XMLOFF_TXTPRMAP_HXX //#include <xmloff/txtprmap.hxx> #endif -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif #include <xmloff/xmlnume.hxx> #include <xmloff/xmlexp.hxx> -#ifndef _XMLOFF_XMLSECTIONEXPORT_HXX #include "XMLSectionExport.hxx" -#endif #include "XMLLineNumberingExport.hxx" #include "txtexppr.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #ifndef _XMLOFF_STYLEEXP_HXX //#include <xmloff/styleexp.hxx> diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index a294ee6e9388..55c196f318b5 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -33,9 +33,7 @@ #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index 832cd1e216a1..7d58e2904949 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -30,14 +30,10 @@ #include "ChartOOoTContext.hxx" #include "MutableAttrList.hxx" #include "xmlnmspe.hxx" -#ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" -#endif #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 8cf8e0df7815..9d59f2deec79 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -33,9 +33,7 @@ #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "ControlOASISTContext.hxx" using ::rtl::OUString; diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index 94d6ae1862b6..caa5c33b35e9 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -34,9 +34,7 @@ #include "ActionMapTypesOOo.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index 732a14f6f7c9..a91cd3ddc803 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "CreateElemTContext.hxx" #include "MutableAttrList.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TransformerActions.hxx" #include "TContextVector.hxx" #include "FlatTContext.hxx" diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx index b37776cb6790..469c9f59659f 100644 --- a/xmloff/source/transform/DeepTContext.cxx +++ b/xmloff/source/transform/DeepTContext.cxx @@ -28,16 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "DeepTContext.hxx" -#ifndef _XMLOFF_FLATTTCONTEXT_HXX #include "FlatTContext.hxx" -#endif #include "EventOOoTContext.hxx" #include "TransformerActions.hxx" #include "ElemTransformerAction.hxx" #include "PersMixedContentTContext.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 08d6682a7491..754860df1b95 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -33,9 +33,7 @@ #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 33b5b2c5dd24..1c5a482699d9 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -36,14 +36,10 @@ #include <xmloff/xmltoken.hxx> #include "xmlnmspe.hxx" -#ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "MutableAttrList.hxx" -#ifndef _XMLOFF_METATCONTEXT_HXX #include "DocumentTContext.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index 23e4d699c349..8dd9e334709a 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -34,9 +34,7 @@ #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #ifndef OASIS_FILTER_OOO_1X // Used to parse Scripting Framework URLs diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 8f90bc66e475..14f7d5324d52 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -31,14 +31,10 @@ #include "EventMap.hxx" #include "MutableAttrList.hxx" #include "xmlnmspe.hxx" -#ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" -#endif #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include <comphelper/stl_types.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx index 93e277670f08..2c5e3e342e84 100644 --- a/xmloff/source/transform/FlatTContext.cxx +++ b/xmloff/source/transform/FlatTContext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "FlatTContext.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 91452183e13e..b8f9334ce95d 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -33,9 +33,7 @@ #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "FormPropOASISTContext.hxx" using ::rtl::OUString; diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index bbe70d7789de..50327c6cced9 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -31,14 +31,10 @@ #include "xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "IgnoreTContext.hxx" -#ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" -#endif #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "FormPropOOoTContext.hxx" using ::rtl::OUString; diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index 084af4ab595c..1f50a050351f 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -34,9 +34,7 @@ #include "ActionMapTypesOASIS.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index bda9526e366d..f6e7674cf734 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -36,9 +36,7 @@ #include "AttrTransformerAction.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx index 7583338891f5..42858e28980f 100644 --- a/xmloff/source/transform/IgnoreTContext.cxx +++ b/xmloff/source/transform/IgnoreTContext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "IgnoreTContext.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 337bce70e32a..b178909a9b5c 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "MergeElemTContext.hxx" #include "MutableAttrList.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TransformerActions.hxx" #include "AttrTransformerAction.hxx" #include "ElemTransformerAction.hxx" diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx index 3ee3d6f082d6..8ede879a41ed 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -35,9 +35,7 @@ #include <xmloff/xmltoken.hxx> #include "xmlnmspe.hxx" -#ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "MutableAttrList.hxx" #include "MetaTContext.hxx" diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index 31457e3ce229..30414452ce3a 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -35,9 +35,7 @@ #include <xmloff/xmltoken.hxx> #include "xmlnmspe.hxx" -#ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TransformerActions.hxx" #include "AttrTransformerAction.hxx" #include "ActionMapTypesOASIS.hxx" @@ -45,9 +43,7 @@ #include "RenameElemTContext.hxx" #include "FlatTContext.hxx" -#ifndef _XMLOFF_NOTESCONTEXT_HXX #include "NotesTContext.hxx" -#endif using ::rtl::OUString; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 4afa5a40c2ca..6cde91847d9c 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -47,9 +47,7 @@ #include "PropertyActionsOOo.hxx" #include "TransformerActions.hxx" #include <xmloff/xmluconv.hxx> -#ifndef _XMLOFF_OOO2OOO_HXX #include "OOo2Oasis.hxx" -#endif using ::rtl::OUString; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 5292c931a609..d74e35f83a07 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -36,16 +36,12 @@ #include "DeepTContext.hxx" #include "MetaTContext.hxx" #include "DocumentTContext.hxx" -#ifndef _XMLOFF_NOTESCONTEXT_HXX #include "NotesTContext.hxx" -#endif #include "StyleOASISTContext.hxx" #include "FrameOASISTContext.hxx" #include "EventOASISTContext.hxx" #include "DlgOASISTContext.hxx" -#ifndef _XMLOFF_CONTROLOASISTCONTEXT_HXX #include "ControlOASISTContext.hxx" -#endif #include "FormPropOASISTContext.hxx" #include "ChartOASISTContext.hxx" #include "ChartPlotAreaOASISTContext.hxx" diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index b9998d5465e5..6419704a8851 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/util/XCloneable.hpp> #include "IgnoreTContext.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "MutableAttrList.hxx" #include <xmloff/nmspmap.hxx> #include "PersAttrListTContext.hxx" diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 72fcb6c69248..29fae56019e8 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "PersMixedContentTContext.hxx" using ::rtl::OUString; diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx index 02874fd9dc1f..af12a9a9f2cd 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.cxx +++ b/xmloff/source/transform/ProcAddAttrTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ProcAddAttrTContext.hxx" #include "MutableAttrList.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include <xmloff/nmspmap.hxx> using ::rtl::OUString; diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx index b068ba03e558..ab1b87e3dfd6 100644 --- a/xmloff/source/transform/ProcAttrTContext.cxx +++ b/xmloff/source/transform/ProcAttrTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ProcAttrTContext.hxx" #include "MutableAttrList.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TransformerActions.hxx" #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx index 026f6add68bc..d20fb17d0693 100644 --- a/xmloff/source/transform/RenameElemTContext.cxx +++ b/xmloff/source/transform/RenameElemTContext.cxx @@ -29,9 +29,7 @@ #include "precompiled_xmloff.hxx" #include "RenameElemTContext.hxx" #include "MutableAttrList.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include <xmloff/nmspmap.hxx> using ::rtl::OUString; diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 6c0aba3bb798..f4ed2cc0f71a 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -38,9 +38,7 @@ #include "PropType.hxx" #include "DeepTContext.hxx" #include "ProcAttrTContext.hxx" -#ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TransformerActions.hxx" #include "ActionMapTypesOASIS.hxx" #include "MutableAttrList.hxx" diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index d3a5af703812..b401ab4f33f9 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -42,13 +42,9 @@ #include "MutableAttrList.hxx" #include "TransformerActions.hxx" #include "PropertyActionsOOo.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif -#ifndef _XMLOFF_STYLEOASISTCONTEXT_HXX #include "StyleOOoTContext.hxx" -#endif #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 5bfcdfc981f9..6a6a065dbeda 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -44,14 +44,10 @@ #include "TransformerActions.hxx" #include "ElemTransformerAction.hxx" #include "PropertyActionsOOo.hxx" -#ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX #include "TransformerTokenMap.hxx" -#endif #include <xmloff/xmluconv.hxx> -#ifndef _XMLOFF_TRANSFORMERBASE_HXX #include "TransformerBase.hxx" -#endif #include "TContextVector.hxx" using ::rtl::OUString; diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index 09635ad560b3..03da18d32b1a 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -33,13 +33,9 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> -#ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" -#endif -#ifndef _XMLOFF_TRANSFOERMERCONTEXT_HXX #include "TransformerContext.hxx" -#endif using ::rtl::OUString; diff --git a/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx index a3020cf2fa3b..ea0da92fcd22 100644 --- a/xmloff/source/transform/TransformerTokenMap.cxx +++ b/xmloff/source/transform/TransformerTokenMap.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX #include "TransformerTokenMap.hxx" -#endif using namespace ::xmloff::token; diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index b95665eef01e..932bb9f2a6ef 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmlscript.hxx" -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif using namespace ::rtl; using namespace ::com::sun::star::uno; |