diff options
Diffstat (limited to 'framework')
93 files changed, 0 insertions, 472 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index d6e596d6a4..e2f299f6e0 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 88a941294a..9a7eb79dd8 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 9ed0e11786..f0a7003a34 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 644b41b706..936c48e6c4 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 c85cb404ff..0502eb0fe5 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 f35d8ac84a..818e6f450e 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 48c45e8193..c479844f5a 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 5533b1f32a..183bf0d592 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 a8b7df2d74..9f3631e47d 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 b595cce880..6bb1a41ff7 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 3b48c71505..78eaea6287 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 0dbc626fad..0dbc626fad 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 e9a970b883..5d5a730c1a 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 75f77c6261..364aa1d63c 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 22565cc652..234e3f0432 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 b42c1b082a..843a7de348 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 2688aaf0ef..2e1ae98b20 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 0a46de752a..2457ae625f 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 3baeb1ab9c..3baeb1ab9c 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 b0baf1bcf8..5edd3cc9e5 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 912d80c75d..daa5663bf7 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 405da6d91a..b8c8529fca 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 23a638ea4e..35af336a8a 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 ecfe81a034..35a94fdd4a 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 089cf3061e..e0873d9286 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 e2250f3faa..0746c6400c 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 40f278d148..4bc1fe7d98 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 14357a8d13..292fd55d7f 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 5bb7acc7c9..bd64e99ae6 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 1b0cd5717a..cb6614ef28 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 68683df34c..63d11a11c8 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 271532f7b0..eb8f71ccad 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 166f489b94..5c44a663b5 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 f59ea721ec..7876c23462 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 6a07b7fda0..a8735b2578 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 b2bd849417..03e2a59c9a 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 0fb110c3a3..b819b38c06 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 82e89010f6..c07cf74f74 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 4e38983ba7..f88f040c4c 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 869a65dc42..9012c0215c 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 a9fdf6f8de..14f4dd5e56 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 ff99b5ae50..ff99b5ae50 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 54f8ecf506..d222092f3d 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 a3510df765..5f38f5af7b 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 dd9d42958a..73866a2db0 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 d6c7f26b95..f0497657bd 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 63caa7380f..2238150b32 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 8135670084..18101a3e03 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 d98caee191..c0e1cd9105 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 6a0516e258..52212e1404 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 328d68fd80..0eb9fd5385 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 0325817d8e..ba316c1ef9 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 23e5eea145..7eea9bb45b 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 6a885e972d..38288ed32f 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 24fb1abc15..2c66680b31 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 fb74197e8e..8e61a4995a 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 53ea643e37..c286754123 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 f10507f734..f2aaa473d6 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 0100618dd5..075fa6269f 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 22154db372..843f8fa087 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 cc408eb6f2..6f66df31fb 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 602d2dc6dd..0224c71b26 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 925127fc03..86b7677297 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 68f654eaae..ccfc335515 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 fd04594c4e..fa82797d07 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 5c06d1b7a1..8af6cc44e7 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 5693bd6346..edf7e95305 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 a61cbf8823..f376c1783d 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 e5fae0992f..a9f44689eb 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 d5d64a32c9..9bc1558fc2 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 957857fe3e..0ff248c55c 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 18bef609fa..53f2ec08b7 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 1055a3ef06..44bab3c724 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 4a1f2fe984..82c6729535 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 d9ae3cfbe1..a156f9bf9a 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 bc3c5a752c..9708e57d45 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 a6fedb6624..0538afc155 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 c324284fdc..568e660708 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 dc2ff7e78b..dc2ff7e78b 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 e897ce5d24..4d7d9cc194 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 8841b7c577..98fce2168a 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 502ee251df..1718e37dab 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 8ab3a1bc0e..9fb3f8e154 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 eb79b31984..7a21112471 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 4cc61462dc..73beda7e0c 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 55bcd3564b..fe38c24f19 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 e67ec74fa6..43049a4318 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 aac1751b1a..6341a52ec9 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 26853a6995..f6d36dea7e 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 d6f4caebf0..b17dbc658e 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 4ed368af21..417077c506 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 744307f410..e6c37fee3a 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 f1b65e5743..3e51ed4dd0 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> |