From facd86ef9cdac2f0acab13a8b525f0bfb99cac28 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 4 Oct 2010 16:59:40 +0200 Subject: remove include guards using fixguard.py --- framework/source/accelerators/acceleratorcache.cxx | 6 --- .../accelerators/acceleratorconfiguration.cxx | 18 -------- .../source/accelerators/acceleratorexecute.cxx | 14 ------- .../documentacceleratorconfiguration.cxx | 22 ---------- .../moduleacceleratorconfiguration.cxx | 12 ------ framework/source/accelerators/presethandler.cxx | 16 -------- framework/source/accelerators/storageholder.cxx | 16 -------- framework/source/application/framework.cxx | 8 ---- framework/source/application/login.cxx | 2 - framework/source/classes/bmkmenu.cxx | 2 - framework/source/classes/framecontainer.cxx | 6 --- framework/source/classes/fwlresid.cxx | 0 framework/source/classes/menumanager.cxx | 2 - framework/source/constant/containerquery.cxx | 2 - framework/source/constant/contenthandler.cxx | 2 - framework/source/constant/frameloader.cxx | 2 - framework/source/dispatch/interceptionhelper.cxx | 2 - framework/source/dispatch/oxt_handler.cxx | 18 -------- .../source/dispatch/windowcommanddispatch.cxx | 0 framework/source/helper/ocomponentaccess.cxx | 2 - framework/source/helper/ocomponentenumeration.cxx | 2 - framework/source/helper/oframes.cxx | 2 - framework/source/helper/persistentwindowstate.cxx | 4 -- framework/source/helper/statusindicatorfactory.cxx | 4 -- framework/source/helper/tagwindowasmodified.cxx | 4 -- framework/source/helper/titlebarupdate.cxx | 48 ---------------------- framework/source/helper/vclstatusindicator.cxx | 2 - framework/source/interaction/quietinteraction.cxx | 2 - framework/source/jobs/jobexecutor.cxx | 2 - framework/source/layoutmanager/layoutmanager.cxx | 4 -- framework/source/loadenv/loadenv.cxx | 10 ----- framework/source/loadenv/targethelper.cxx | 2 - framework/source/register/registerlogindialog.cxx | 2 - framework/source/services/backingcomp.cxx | 6 --- framework/source/services/desktop.cxx | 6 --- framework/source/services/frame.cxx | 6 --- framework/source/services/menudocumenthandler.cxx | 4 -- framework/source/services/sessionlistener.cxx | 2 - framework/source/services/substitutepathvars.cxx | 2 - framework/source/services/taskcreatorsrv.cxx | 2 - framework/source/tabwin/tabwindow.cxx | 2 - .../source/uiconfiguration/imagemanagerimpl.cxx | 0 .../moduleuiconfigurationmanager.cxx | 2 - .../uiconfiguration/uicategorydescription.cxx | 4 -- .../uiconfiguration/uiconfigurationmanager.cxx | 2 - .../uiconfiguration/uiconfigurationmanagerimpl.cxx | 2 - .../source/uielement/addonstoolbarmanager.cxx | 18 -------- .../source/uielement/addonstoolbarwrapper.cxx | 4 -- .../source/uielement/buttontoolbarcontroller.cxx | 4 -- .../source/uielement/comboboxtoolbarcontroller.cxx | 6 --- .../source/uielement/complextoolbarcontroller.cxx | 6 --- .../uielement/dropdownboxtoolbarcontroller.cxx | 6 --- .../source/uielement/edittoolbarcontroller.cxx | 6 --- framework/source/uielement/fontmenucontroller.cxx | 4 -- .../source/uielement/fontsizemenucontroller.cxx | 8 ---- .../source/uielement/footermenucontroller.cxx | 4 -- .../source/uielement/generictoolbarcontroller.cxx | 6 --- .../source/uielement/headermenucontroller.cxx | 4 -- .../uielement/imagebuttontoolbarcontroller.cxx | 4 -- .../uielement/langselectionmenucontroller.cxx | 6 --- .../uielement/langselectionstatusbarcontroller.cxx | 4 -- .../uielement/logoimagestatusbarcontroller.cxx | 2 - .../uielement/logotextstatusbarcontroller.cxx | 2 - framework/source/uielement/menubarmanager.cxx | 4 -- framework/source/uielement/newmenucontroller.cxx | 2 - .../source/uielement/objectmenucontroller.cxx | 4 -- framework/source/uielement/progressbarwrapper.cxx | 2 - .../source/uielement/recentfilesmenucontroller.cxx | 4 -- .../uielement/simpletextstatusbarcontroller.cxx | 2 - .../uielement/spinfieldtoolbarcontroller.cxx | 6 --- framework/source/uielement/statusbarmanager.cxx | 2 - framework/source/uielement/statusbarwrapper.cxx | 2 - .../uielement/togglebuttontoolbarcontroller.cxx | 4 -- framework/source/uielement/toolbarmanager.cxx | 10 ----- .../source/uielement/toolbarsmenucontroller.cxx | 6 --- framework/source/uielement/toolbarwrapper.cxx | 4 -- .../source/uielement/uicommanddescription.cxx | 2 - .../source/uifactory/addonstoolboxfactory.cxx | 2 - .../source/uifactory/factoryconfiguration.cxx | 0 framework/source/uifactory/menubarfactory.cxx | 4 -- framework/source/uifactory/statusbarfactory.cxx | 2 - framework/source/uifactory/toolboxfactory.cxx | 2 - .../source/xml/acceleratorconfigurationreader.cxx | 2 - framework/source/xml/eventsconfiguration.cxx | 4 -- framework/source/xml/eventsdocumenthandler.cxx | 2 - framework/source/xml/imagesconfiguration.cxx | 4 -- framework/source/xml/imagesdocumenthandler.cxx | 2 - framework/source/xml/menuconfiguration.cxx | 4 -- framework/source/xml/statusbarconfiguration.cxx | 2 - framework/source/xml/statusbardocumenthandler.cxx | 2 - framework/source/xml/toolboxconfiguration.cxx | 2 - framework/test/threadtest.cxx | 6 --- framework/test/threadtest/threadtest.cxx | 4 -- 93 files changed, 472 deletions(-) mode change 100755 => 100644 framework/source/classes/fwlresid.cxx mode change 100755 => 100644 framework/source/dispatch/windowcommanddispatch.cxx mode change 100755 => 100644 framework/source/uiconfiguration/imagemanagerimpl.cxx mode change 100755 => 100644 framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx mode change 100755 => 100644 framework/source/uifactory/factoryconfiguration.cxx (limited to 'framework') 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 -#endif #include #include //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include -#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 -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include -#endif -#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED #include -#endif -#ifndef _RTL_LOGFILE_HXX_ #include -#endif #include 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 -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef __COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#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 -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #include -#endif -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_ #include -#endif -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include -#endif //_______________________________________________ // own includes #include #include -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include -#endif #include //_______________________________________________ // interface includes -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_ #include -#endif //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include -#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 #include -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include -#endif #include //_______________________________________________ @@ -48,26 +46,16 @@ //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include -#endif #include -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include -#endif -#ifndef _RTL_LOGFILE_HXX_ #include -#endif -#ifndef _RTL_LOGFILE_HXX_ #include -#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 -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif //_______________________________________________ // other includes #include -#ifndef _RTL_USTRBUF_HXX #include -#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 -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_EMBED_XPACKAGESTRUCTURECREATOR_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef __COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include -#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 -#endif #include #include -#ifndef __FRAMEWORK_DEFINES_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,13 +52,9 @@ #include #include -#ifndef _COM_SUN_STAR_CONNECTION_XConnection_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BRIDGE_XBridgeFactory_HPP_ #include -#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 -#endif #include #include #include 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 #include #include -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include #include 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 -#endif #include #include -#ifndef __FRAMEWORK_COMMANDS_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx old mode 100755 new mode 100644 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 #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 -#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 -#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 -#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 -#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 -#endif -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include -#endif -#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -71,13 +57,9 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include -#endif -#ifndef _RTL_USTRBUF_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx old mode 100755 new mode 100644 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 #include -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include -#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 -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include -#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 -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include -#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 -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include -#endif #include #include @@ -56,9 +54,7 @@ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 -#ifndef _COM_SUN_STAR_AWT_XCONTROLS_HPP_ #include -#endif #include #include #include @@ -56,9 +54,7 @@ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#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 -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include -#endif #include #include #include @@ -54,9 +52,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #include -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include -#endif -#ifndef __FRAMEWORK_PROPETIES_H_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XMATERIALHOLDER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include -#endif -#ifndef _UTL_CONFIGMGR_HXX #include -#endif -#ifndef _UTL_BOOTSTRAP_HXX #include -#endif -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef _SV_SYSWIN_HXX #include -#endif -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef _SV_WRKWIN_HXX #include -#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 -#endif #include //----------------------------------------------- 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 #include -#ifndef _COM_SUN_STAR_DOCUMENT_LOCKEDDOCUMENTREQUEST_HPP_ #include -#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 #include -#ifndef __FRAMEWORK_CLASS_CONVERTER_HXX_ #include -#endif #include #include #include 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 -#ifndef _FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_ #include -#endif #include #include @@ -46,9 +44,7 @@ #include #include -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include #include #include 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 -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include -#endif #include #include -#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_ #include -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_ #include -#endif #include #include #include @@ -97,9 +89,7 @@ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 -#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 -#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 #include -#ifndef _FRAMEWORK_HELPID_HRC #include -#endif //_______________________________________________ // interface includes @@ -70,16 +68,12 @@ #include #include -#ifndef _SOLAR_HRC #include -#endif #include #include #include -#ifndef _UTL_BOOTSTRAP_HXX_ #include -#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 -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include -#endif -#ifndef __FRAMEWORK_DESKTOP_HXX_ #include -#endif #include #include -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include -#endif #include #include #include 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 #include -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include -#endif #include #include #include @@ -80,9 +78,7 @@ #include #include -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -97,9 +93,7 @@ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 #include -#ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_ #include -#endif -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include -#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 -#endif #include #include #include 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 #include -#ifndef _UTL_BOOTSTRAP_HXX_ #include -#endif #include #include #include 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 #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include //_______________________________________________ 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 #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include //_________________________________________________________________________________________________________________ diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx old mode 100755 new mode 100644 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 #include -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include -#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 #include "services.h" @@ -57,9 +55,7 @@ #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include 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 #include -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx old mode 100755 new mode 100644 index 5b875d82f25a..021d4bda583c --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -37,9 +37,7 @@ #include #include -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include -#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 -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include -#endif #include #include "services.h" #include #include #include -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include -#endif #include -#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include -#endif -#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include -#endif -#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include -#endif #include #include #include @@ -71,14 +59,10 @@ #include #include #include -#ifndef _COM_SUN_STAR_BEANS_XLAYOUTMANAGER_HPP_ #include -#endif #include #include -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include -#endif #include //_________________________________________________________________________________________________________________ @@ -86,9 +70,7 @@ //_________________________________________________________________________________________________________________ #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 #include -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -60,9 +58,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include #include 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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include 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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include 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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include 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 -#endif #include #include #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include 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 -#endif #include -#ifndef _VCL_SVAPP_HXX_ #include -#endif #include -#ifndef _VCL_OUTPUTDEVICE_HXX_ #include -#endif #include -#ifndef _SVTOOLS_CTRLTOOL_HXX_ #include -#endif #include #include 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 #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include //_________________________________________________________________________________________________________________ @@ -55,9 +53,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include 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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include #include 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 #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include //_________________________________________________________________________________________________________________ @@ -55,9 +53,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include 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 -#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 -#endif #include #include #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include @@ -71,9 +67,7 @@ #include #include -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include #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 #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include @@ -55,9 +53,7 @@ #include #include -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include #include #include 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 #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include 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 #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include 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 #include #include -#ifndef _COM_SUN_STAR_LANG_XSYSTEMDEPENDENT_HPP_ #include -#endif #include #include #include @@ -84,9 +82,7 @@ #include #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include #include #include 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 #include -#ifndef _COM_SUN_STAR_EMBED_VERBDATTRIBUTES_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include 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 -#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 #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include //_________________________________________________________________________________________________________________ @@ -51,9 +49,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include 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 #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include 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 #include -#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 #include #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #ifdef WINNT #include 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 -#endif #include #include 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 -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 -#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 -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include -#endif #include #include "services.h" #include "general.h" @@ -47,9 +43,7 @@ #include #include #include -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include -#endif #include #include #include @@ -62,9 +56,7 @@ #include #include #include -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include -#endif #include #include #include @@ -84,9 +76,7 @@ #include #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include -#endif #include #include #include @@ -63,17 +61,13 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include #include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include #include 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 #include -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -59,9 +57,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include #include 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 #include -#ifndef _VCL_MNEMONIC_HXX_ #include -#endif #include #include 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 #include -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx old mode 100755 new mode 100644 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 #include -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include -#endif #include #include #include 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 #include -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include -#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 #include -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include -#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 -#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 #include -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -47,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include 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 -#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 #include -#ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_ #include -#endif #include //_________________________________________________________________________________________________________________ @@ -47,9 +45,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include 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 -#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 -#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_ #include -#endif #include #include #include #include -#ifndef _FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ #include -#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 -#endif #include #include 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 -#endif #include #include #include 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 -#endif #include #include 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 #include -#ifndef __FRAMEWORK_THREADHELP_RWLOCKBASE_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include -#endif #include #include @@ -60,9 +56,7 @@ #include #include -#ifndef _OSL_INTERLOCK_H_ #include -#endif #include #include 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 -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include -#endif #include #include #include @@ -57,9 +55,7 @@ #include #include -#ifndef _OSL_INTERLOCK_H_ #include -#endif #include #include -- cgit v1.2.3