diff options
Diffstat (limited to 'framework/source')
159 files changed, 2 insertions, 1376 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 071e3103e974..179d63963d19 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -19,22 +19,14 @@ #include <accelerators/acceleratorcache.hxx> -//_______________________________________________ -// own includes - #include <xml/acceleratorconfigurationreader.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -//_______________________________________________ -// interface includes - #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> namespace framework diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 96c8e3017cda..be9982f3a249 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -28,8 +28,6 @@ #include <accelerators/acceleratorconfiguration.hxx> -//_______________________________________________ -// own includes #include <pattern/configuration.hxx> #include <accelerators/presethandler.hxx> @@ -43,8 +41,6 @@ #include <acceleratorconst.h> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -53,8 +49,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 6b13a72712a0..25a3fefb84d8 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -34,17 +34,12 @@ #include <xml/saxnamespacefilter.hxx> -//_______________________________________________ -// own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <acceleratorconst.h> #include <services.h> -//_______________________________________________ -// interface includes - #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> @@ -57,9 +52,6 @@ #include <com/sun/star/xml/sax/XParser.hpp> -//_______________________________________________ -// other includes - #include <comphelper/sequenceashashmap.hxx> //_______________________________________________ diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index c5853f8f1fa5..3ee289eeb8f0 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -28,8 +28,6 @@ #include <accelerators/globalacceleratorconfiguration.hxx> -//_______________________________________________ -// own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include "helper/mischelper.hxx" @@ -37,16 +35,12 @@ #include <acceleratorconst.h> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> #include <comphelper/locale.hxx> #include <comphelper/configurationhelper.hxx> diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index fdf6fe70fb4c..57ab6d816f65 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -28,19 +28,10 @@ #include <accelerators/keymapping.hxx> -//_______________________________________________ -// own includes - #include <macros/generic.hxx> -//_______________________________________________ -// interface includes #include <com/sun/star/awt/Key.hpp> -//_______________________________________________ -// other includes - -//_______________________________________________ // namespace namespace framework diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index b5117eaa7fdb..3d88f5d0a704 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -28,8 +28,6 @@ #include <accelerators/moduleacceleratorconfiguration.hxx> -//_______________________________________________ -// own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include "helper/mischelper.hxx" @@ -37,15 +35,10 @@ #include <acceleratorconst.h> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/embed/ElementModes.hpp> -//_______________________________________________ -// other includes - #include <comphelper/sequenceashashmap.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index a72d8f22c577..fa0d1f388046 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -28,8 +28,6 @@ #include <accelerators/presethandler.hxx> -//_______________________________________________ -// own includes #include <classes/fwkresid.hxx> #include "classes/resource.hrc" @@ -37,9 +35,6 @@ #include <threadhelp/writeguard.hxx> #include <services.h> -//_______________________________________________ -// interface includes - #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -48,8 +43,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index d442274f94d6..1c73c56bce4f 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -28,15 +28,10 @@ #include <accelerators/storageholder.hxx> -//=============================================== -// own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <services.h> -//=============================================== -// interface includes - #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -53,8 +48,6 @@ #include <com/sun/star/io/XSeekable.hpp> -//=============================================== -// other includes #include <comphelper/processfactory.hxx> //=============================================== diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 897e1706abe3..e6cd4820922f 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -26,19 +26,12 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <classes/droptargetlistener.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <targets.h> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -46,9 +39,6 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/transfer.hxx> #include <unotools/localfilehelper.hxx> #include <sot/filelist.hxx> diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 1a4e7428cec5..f06be92c8415 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -26,24 +26,12 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/framecontainer.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/frame/FrameSearchFlag.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 8797cd687315..effb9680a6cd 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <classes/menumanager.hxx> #include <framework/menuconfiguration.hxx> #include <framework/bmkmenu.hxx> @@ -42,9 +37,6 @@ #include <services.h> #include "classes/resource.hrc" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> @@ -56,9 +48,6 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/util/XStringWidth.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <comphelper/componentcontext.hxx> diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 987b8f4d1c03..ff4f10a3895e 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -26,33 +26,19 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <classes/taskcreator.hxx> #include "services/taskcreatorsrv.hxx" #include <threadhelp/readguard.hxx> #include <loadenv/targethelper.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// includes of my own project -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 1a332676b172..3f732d4110f0 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//_______________________________________________ -// my own includes #include <dispatch/closedispatcher.hxx> #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> @@ -37,8 +34,6 @@ #include <services.h> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/CommandGroup.hpp> @@ -48,9 +43,6 @@ #include "com/sun/star/beans/XFastPropertySet.hpp" #include <toolkit/helper/vclunohelper.hxx> -//_______________________________________________ -// includes of other projects - #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include "vcl/syswin.hxx" diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 91c003df14e5..4d1956502496 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <dispatch/dispatchinformationprovider.hxx> #include <dispatch/closedispatcher.hxx> #include <threadhelp/readguard.hxx> @@ -37,14 +33,8 @@ #include <stdtypes.h> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/CommandGroup.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <comphelper/sequenceasvector.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 4cb3987badfb..5995f69c8af8 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -26,18 +26,10 @@ * ************************************************************************/ - -//_______________________________________________ -// my own includes - #include <dispatch/interceptionhelper.hxx> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XInterceptorInfo.hpp> -//_______________________________________________ -// includes of other projects #include <vcl/svapp.hxx> //_______________________________________________ diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 0b5f437debb9..2f9f69089c09 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -26,26 +26,15 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <dispatch/mailtodispatcher.hxx> #include <threadhelp/readguard.hxx> #include <general.h> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index f1f42624c85f..703c5bfbbc54 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -26,19 +26,12 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <dispatch/menudispatcher.hxx> #include <general.h> #include <framework/menuconfiguration.hxx> #include <framework/addonmenu.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> @@ -60,10 +53,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <ucbhelper/content.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index ad3e493e9927..8615a2497ca7 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <dispatch/oxt_handler.hxx> #include <threadhelp/transactionguard.hxx> @@ -44,18 +40,10 @@ #include <comphelper/mediadescriptor.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <comphelper/sequenceashashmap.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 07781a19afef..bfab7950ca55 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <dispatch/popupmenudispatcher.hxx> #include <general.h> #include <framework/menuconfiguration.hxx> @@ -38,9 +33,6 @@ #include <services.h> #include <properties.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> @@ -52,10 +44,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumeration.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <ucbhelper/content.hxx> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 72a8e64f252d..3f46db6de266 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -26,25 +26,14 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <dispatch/servicehandler.hxx> #include <threadhelp/readguard.hxx> #include <general.h> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 90e0eefcfb8c..9bdbe11915ac 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -29,9 +29,6 @@ #include <dispatch/startmoduledispatcher.hxx> -//_______________________________________________ -// my own includes - #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -41,8 +38,6 @@ #include <services.h> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/CommandGroup.hpp> @@ -50,8 +45,6 @@ #include "com/sun/star/beans/XFastPropertySet.hpp" #include <com/sun/star/frame/XModuleManager.hpp> -//_______________________________________________ -// includes of other projects #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index e2e9d80cd926..b57097432ded 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -26,28 +26,17 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <dispatch/systemexec.hxx> #include <threadhelp/readguard.hxx> #include <general.h> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <comphelper/componentcontext.hxx> diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 1a1637b2ea43..d1c15f315a39 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -26,27 +26,17 @@ * ************************************************************************/ - -//_______________________________________________ -// my own includes - #include <dispatch/windowcommanddispatch.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <targets.h> #include <services.h> -//_______________________________________________ -// interface includes - #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -//_______________________________________________ -// includes of other projects - #include <comphelper/componentcontext.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index afe39ba1b966..250fc1620ab3 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "framework/addonmenu.hxx" #include "framework/addonsoptions.hxx" #include <general.h> @@ -37,17 +33,11 @@ #include <framework/imageproducer.hxx> #include <framework/menuconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> #include <svtools/menuoptions.hxx> diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index f2316b617a55..aadf95e3752f 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ #include <framework/addonsoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index fdf3721f740e..61c179049a58 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <limits.h> #include "framework/bmkmenu.hxx" @@ -39,9 +34,6 @@ #include <framework/imageproducer.hxx> #include <framework/menuconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -50,9 +42,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/DateTime.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <unotools/dynamicmenuoptions.hxx> #include <svtools/menuoptions.hxx> diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 307ed69501b8..3df2b0d07ad7 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -29,22 +29,16 @@ #include "framework/framelistanalyzer.hxx" -//_______________________________________________ -// my own includes #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> #include <targets.h> #include <properties.h> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_______________________________________________ -// includes of other projects #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index fa1e92feaf92..f2898f5fc218 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <comphelper/interaction.hxx> #include <framework/interaction.hxx> #include <general.h> diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 0ab3582bd311..f95d2252276f 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_______________________________________________ -// includes - #include <framework/titlehelper.hxx> #include <services.h> #include <properties.h> diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 6c432f7ee193..29b06b3ff70b 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -20,21 +20,10 @@ #include "framework/preventduplicateinteraction.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> //_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 966b774876cc..0c5463b9b119 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <framework/menuconfiguration.hxx> #include <framework/bmkmenu.hxx> @@ -40,9 +36,6 @@ #include <uielement/rootitemcontainer.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index b4e065bc0e43..dac8637ba078 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -32,18 +32,11 @@ #include <xml/saxnamespacefilter.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index ba54467ca4cb..3b64e62b829d 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -29,26 +29,15 @@ #include <stdio.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/resetableguard.hxx> #include <xml/statusbardocumenthandler.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/status.hxx> diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 3cd9b2bec9aa..b2fefb42a633 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -32,18 +32,11 @@ #include <xml/saxnamespacefilter.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx index a5702dab8833..dcfe37449bc6 100644 --- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx @@ -20,24 +20,13 @@ #include <stdio.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/resetableguard.hxx> #include <xml/toolboxlayoutdocumenthandler.hxx> #include <macros/debug.hxx> #include <xml/toolboxconfigurationdefines.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 4b870713a59e..aa0c1dd6c083 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -26,20 +26,11 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes - #include <classes/propertysethelper.hxx> #include <threadhelp/transactionguard.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes - -//_________________________________________________________________________________________________________________ -// other includes //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 3eaa7c804578..1fb153853e4d 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -33,23 +33,12 @@ - may its a good idea to replace struct ProtocolHandler by css::beans::NamedValue type?! */ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/protocolhandlercache.hxx> #include <classes/converter.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/lockhelper.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <tools/wldcrd.hxx> #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index b6e13167d13b..b0e139b50fc6 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/configaccess.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -36,16 +33,12 @@ #include <general.h> #include <services.h> -//________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -//________________________________ -// includes of other projects #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx index 60a9f3859218..97744b702e84 100644 --- a/framework/source/fwi/jobs/jobconst.cxx +++ b/framework/source/fwi/jobs/jobconst.cxx @@ -26,19 +26,8 @@ * ************************************************************************/ - -//________________________________ -// my own includes - #include <jobs/jobconst.hxx> -//________________________________ -// interface includes - -//________________________________ -// includes of other projects - -//________________________________ // namespace namespace framework{ diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 4c38078364af..46da6050c403 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/lockhelper.hxx> #include <general.h> #include <macros/debug.hxx> @@ -37,13 +33,6 @@ #include <macros/generic.hxx> #include "vcl/solarmutex.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <osl/process.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 5468ba859765..554a59c21ae3 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/transactionmanager.hxx> #include <threadhelp/resetableguard.hxx> #include <macros/debug.hxx> @@ -28,13 +24,7 @@ #include <macros/generic.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ // const diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index ede715b89e08..bbd4da21cd9b 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -26,18 +26,11 @@ * ************************************************************************/ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/itemcontainer.hxx> #include <uielement/constitemcontainer.hxx> #include <threadhelp/resetableguard.hxx> #include <comphelper/servicehelper.hxx> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 2aa7b7cca92c..92fca28ccc08 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -36,10 +36,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 897a1f1cecbb..9c700fcb67bc 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -26,24 +26,13 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/dockingareadefaultacceptor.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 9eeddbb7519e..c08e6464a971 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -17,23 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index c1b99656b2dd..e8cceaf64762 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -17,21 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/ocomponentenumeration.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 963380122499..a01c22e2849c 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -26,23 +26,13 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/oframes.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 74652f67ced8..b64005a9b5ee 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <pattern/window.hxx> #include <helper/persistentwindowstate.hxx> #include <threadhelp/writeguard.hxx> @@ -37,18 +33,12 @@ #include <macros/generic.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/window.hxx> #include <vcl/syswin.hxx> diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 7e0a9884f156..5cedd956d3c4 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//----------------------------------------------- -// my own includes - #include <algorithm> #include <helper/statusindicatorfactory.hxx> #include <helper/statusindicator.hxx> @@ -39,8 +35,6 @@ #include <services.h> #include <properties.h> -//----------------------------------------------- -// interface includes #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/XControl.hpp> @@ -55,8 +49,6 @@ #include <toolkit/unohlp.hxx> -//----------------------------------------------- -// includes of other projects #include <comphelper/sequenceashashmap.hxx> #include <comphelper/mediadescriptor.hxx> #include <comphelper/configurationhelper.hxx> diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 341a31ea8ad7..5ad706a0ff3f 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/tagwindowasmodified.hxx> #include <pattern/window.hxx> #include <threadhelp/writeguard.hxx> @@ -28,9 +24,6 @@ #include <macros/generic.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -38,10 +31,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/FrameAction.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <toolkit/unohlp.hxx> #include <vcl/window.hxx> #include <vcl/syswin.hxx> diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index dd368a5cbcc2..6c4951a0de8c 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -28,9 +28,6 @@ #include <helper/titlebarupdate.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <pattern/window.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> @@ -38,7 +35,6 @@ #include <services.h> #include <properties.h> -// interface includes #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -49,7 +45,6 @@ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/beans/NamedValue.hpp> -// other includes #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 185008b6bbca..e1b9579ce2bf 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> #include <general.h> #include <properties.h> @@ -37,17 +33,11 @@ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index cc03c0ddbd48..4c01dbefe554 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -26,25 +26,15 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/uielementwrapperbase.hxx> #include <general.h> #include <properties.h> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 277e60f6061f..d070ad500a78 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -28,17 +28,9 @@ #include <helper/vclstatusindicator.hxx> -//----------------------------------------------- -// includes of own modules #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -//----------------------------------------------- -// includes of interfaces - -//----------------------------------------------- -// includes of external modules - #include <toolkit/unohlp.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index dc19da763d6c..77c1effeec6f 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -29,20 +29,12 @@ #ifndef __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_ #define __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_ -//__________________________________________ -// own includes - #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes - #include <com/sun/star/awt/KeyEvent.hpp> -//__________________________________________ -// other includes #include <comphelper/sequenceasvector.hxx> //__________________________________________ diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 13c1a94e4dad..78ed23ace81c 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_ #define __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_ -//__________________________________________ -// own includes - #include <accelerators/istoragelistener.hxx> #include <accelerators/presethandler.hxx> #include <accelerators/acceleratorcache.hxx> @@ -42,9 +39,6 @@ #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes - #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -61,8 +55,6 @@ // TODO use XPresetHandler interface instead if available #include <com/sun/star/form/XReset.hpp> -//__________________________________________ -// other includes #include <cppuhelper/propshlp.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/locale.hxx> diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx index c9d480d870bb..2bddcc562031 100644 --- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_ #define __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_ -//__________________________________________ -// own includes - #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/istoragelistener.hxx> #include <accelerators/presethandler.hxx> @@ -31,15 +28,9 @@ #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//__________________________________________ -// interface includes #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> -//__________________________________________ -// other includes - -//__________________________________________ // definition namespace framework diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 28c7ba4eb12b..2f2d4d79c3c0 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_ #define __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_ -//__________________________________________ -// own includes - #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> @@ -39,15 +36,8 @@ #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//__________________________________________ -// interface includes - #include <com/sun/star/lang/XInitialization.hpp> -//__________________________________________ -// other includes - -//__________________________________________ // definition namespace framework diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index 667b7dc4f4d7..0a89e99a2687 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -29,17 +29,9 @@ #ifndef __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_ #define __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_ -//__________________________________________ -// own includes - #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes - -//__________________________________________ -// other includes //__________________________________________ // definition diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index d64964d5cf4d..c0c4693e9569 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -29,20 +29,11 @@ #ifndef __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_ #define __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_ -//__________________________________________ -// own includes - #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes #include <com/sun/star/lang/IllegalArgumentException.hpp> -//__________________________________________ -// other includes - -//__________________________________________ // definition namespace framework diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index 05588598ebf8..a94a65e749a5 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_ #define __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_ -//__________________________________________ -// own includes - #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> @@ -39,14 +36,8 @@ #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//__________________________________________ -// interface includes #include <com/sun/star/lang/XInitialization.hpp> -//__________________________________________ -// other includes - -//__________________________________________ // definition namespace framework diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 8d4f0c73de6d..3254e0c2c0df 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -20,23 +20,15 @@ #ifndef __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_ #define __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_ -//__________________________________________ -// own includes - #include <accelerators/storageholder.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes - #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//__________________________________________ -// other includes #include <comphelper/processfactory.hxx> #include <salhelper/singletonref.hxx> #include <comphelper/locale.hxx> diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 78c1a28d39f2..63aacd3a4eee 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -29,26 +29,15 @@ #ifndef __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_ #define __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_ -//=============================================== -// own includes - #include <accelerators/istoragelistener.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> -//=============================================== -// interface includes - #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//=============================================== -// other includes - - -//=============================================== // namespace namespace css = ::com::sun::star; diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 4f2cfd7a4d2a..fe38971322ec 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -20,19 +20,11 @@ #ifndef __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_ -//_______________________________________________ -// my own includes - #include <loadenv/loadenv.hxx> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> -//_______________________________________________ -// other includes - #include <cppuhelper/implbase2.hxx> //_______________________________________________ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 5315240d7a94..fd2fa7e7f609 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -29,22 +29,13 @@ #ifndef __FRAMEWORK_DISPATCH_WINDOWCOMMANDDISPATCH_HXX_ #define __FRAMEWORK_DISPATCH_WINDOWCOMMANDDISPATCH_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> -//_______________________________________________ -// interface includes - #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_______________________________________________ -// other includes - #include <cppuhelper/implbase1.hxx> #include <tools/link.hxx> diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 31a96d2abf04..e080e6d91848 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -20,20 +20,13 @@ #ifndef __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_ #define __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_ -//_______________________________________________ -// includes of own project #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> -//_______________________________________________ -// includes of uno interface #include <com/sun/star/document/XActionLockable.hpp> //_______________________________________________ -// includes of an other project - -//_______________________________________________ // namespace namespace framework{ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index edd5e55c6254..10a57715c011 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -28,15 +28,11 @@ #ifndef __FRAMEWORK_LOADENV_LOADENV_HXX_ #define __FRAMEWORK_LOADENV_LOADENV_HXX_ -//_______________________________________________ -// includes of own project #include <loadenv/loadenvexception.hxx> #include <loadenv/actionlockguard.hxx> #include <threadhelp/threadhelpbase.hxx> -//_______________________________________________ -// includes of uno interface #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrameLoader.hpp> @@ -49,8 +45,6 @@ #include <com/sun/star/io/IOException.hpp> -//_______________________________________________ -// includes of an other project #include <comphelper/mediadescriptor.hxx> #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index e06eef42b9db..b44a96fe080c 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -29,17 +29,10 @@ #ifndef __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_ #define __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_ -//_______________________________________________ -// includes of own project - -//_______________________________________________ -// includes of uno interface #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Exception.hpp> -//_______________________________________________ -// includes of an other project #include <rtl/string.hxx> //_______________________________________________ diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 7af9e7fb10c4..f1abe245a12e 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_TARGETHELPER_HXX_ #define __FRAMEWORK_TARGETHELPER_HXX_ -//_______________________________________________ -// own includes - #include <sal/types.h> #include <rtl/ustring.hxx> #include <targets.h> diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 9d1f8a8b7db3..110f4d2e1744 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -29,14 +29,9 @@ #ifndef __FRAMEWORK_PATTERN_CONFIGURATION_HXX_ #define __FRAMEWORK_PATTERN_CONFIGURATION_HXX_ -//_______________________________________________ -// own includes - #include <services.h> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -44,8 +39,6 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_______________________________________________ -// other includes #include <rtl/ustrbuf.hxx> //_______________________________________________ diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 15577da31dbd..5163733fb1c1 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -20,13 +20,8 @@ #ifndef __FRAMEWORK_PATTERN_FRAME_HXX_ #define __FRAMEWORK_PATTERN_FRAME_HXX_ -//_______________________________________________ -// own includes - #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -34,10 +29,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/XCloseable.hpp> -//_______________________________________________ -// other includes - -//_______________________________________________ // namespaces #ifndef css diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 752f5fe898b4..b5cbd52bf585 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -29,19 +29,11 @@ #ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ #define __FRAMEWORK_PATTERN_WINDOW_HXX_ -//_______________________________________________ -// own includes - #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XTopWindow.hpp> -//_______________________________________________ -// other includes - #include <toolkit/unohlp.hxx> #include <vcl/window.hxx> #include <vcl/syswin.hxx> diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 01a1bd503313..fc7c29a6c0e9 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -20,17 +20,11 @@ #include "interaction/quietinteraction.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/document/XInteractionFilterSelect.hpp> @@ -41,9 +35,6 @@ #include <com/sun/star/document/LockedDocumentRequest.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #ifndef __RSC diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 46e84ab32f11..e1c9dd9afaea 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -26,25 +26,18 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/job.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <general.h> #include <services.h> -//________________________________ -// interface includes #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XAsyncJob.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//________________________________ -// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index f2b990ac8ae0..a078d04f2e63 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/jobdata.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -36,15 +33,11 @@ #include <general.h> #include <services.h> -//________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -//________________________________ -// includes of other projects #include <tools/wldcrd.hxx> #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index d18ae515fc57..1aaa113db18f 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/jobdispatch.hxx> #include <jobs/joburl.hxx> #include <jobs/job.hxx> @@ -39,14 +36,10 @@ #include <general.h> #include <services.h> -//________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//________________________________ -// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index e41c518ed27a..6c23a775f40d 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/jobexecutor.hxx> #include <jobs/job.hxx> #include <jobs/joburl.hxx> @@ -42,14 +39,10 @@ #include "helper/mischelper.hxx" -//________________________________ -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XContainer.hpp> -//________________________________ -// includes of other projects #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index e97825be7f2c..78b84dcefa9f 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//________________________________ -// my own includes - #include <jobs/jobresult.hxx> #include <jobs/jobconst.hxx> #include <threadhelp/readguard.hxx> @@ -28,11 +24,6 @@ #include <general.h> #include <services.h> -//________________________________ -// interface includes - -//________________________________ -// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 01da85855d64..38a91d71eb1d 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -26,19 +26,11 @@ * ************************************************************************/ - -//________________________________ -// my own includes #include <jobs/joburl.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <general.h> -//________________________________ -// interface includes - -//________________________________ -// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 81ca7f8a7b06..edd8de5d0680 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -26,13 +26,10 @@ * ************************************************************************/ - -// my own includes #include "helpers.hxx" #include <threadhelp/resetableguard.hxx> #include <services.h> -// interface includes #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/frame/XDispatchHelper.hpp> @@ -41,7 +38,6 @@ #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/ui/XUIElement.hpp> -// other includes #include <comphelper/mediadescriptor.hxx> #include <vcl/svapp.hxx> #include <toolkit/unohlp.hxx> diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 66d15832f72c..3d11ee5bc19f 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -29,12 +29,10 @@ #ifndef __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_ #define __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_ -// my own includes #include <macros/generic.hxx> #include <stdtypes.h> #include <properties.h> -// interface includes #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -43,7 +41,6 @@ #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/Point.hpp> -// other includes #include <vcl/window.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 9bbd8d7e12e4..be602cfe5fdb 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -// my own includes #include <services/layoutmanager.hxx> #include <helpers.hxx> #include <threadhelp/resetableguard.hxx> @@ -43,7 +42,6 @@ #include <uiconfiguration/globalsettings.hxx> #include <toolbarlayoutmanager.hxx> -// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -68,7 +66,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/URLTransformer.hpp> -// other includes #include <comphelper/componentcontext.hxx> #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 212e7aecaaa5..1972d4ac0662 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -// my own includes #include <toolbarlayoutmanager.hxx> #include <helpers.hxx> #include <services.h> @@ -35,7 +33,6 @@ #include <classes/fwkresid.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> -// interface includes #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/container/XNameReplace.hpp> @@ -43,7 +40,6 @@ #include <com/sun/star/ui/XUIElementSettings.hpp> #include <com/sun/star/ui/XUIFunctionListener.hpp> -// other includes #include <unotools/cmdoptions.hxx> #include <toolkit/unohlp.hxx> #include <toolkit/helper/convert.hxx> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index b52fe4f9cd86..139619f06474 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -35,9 +35,6 @@ #include <memory> #include <vector> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> #include <threadhelp/writeguard.hxx> @@ -55,9 +52,6 @@ #include <uielement/uielement.hxx> #include <helper/ilayoutnotifications.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> @@ -74,10 +68,6 @@ #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/awt/XDockableWindowListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <cppuhelper/implbase3.hxx> diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx index faf282a1bf8d..dda8e5cd9d2d 100644 --- a/framework/source/layoutmanager/uielement.cxx +++ b/framework/source/layoutmanager/uielement.cxx @@ -26,17 +26,8 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <uielement/uielement.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/ui/DockingArea.hpp> //_________________________________________________________________________________________________________________ diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 79224efd433b..952070474a7a 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -//_______________________________________________ -// includes of own project #include <loadenv/loadenv.hxx> #include <loadenv/targethelper.hxx> @@ -44,8 +42,6 @@ #include <comphelper/interaction.hxx> #include <framework/interaction.hxx> -//_______________________________________________ -// includes of uno interface #include <com/sun/star/task/ErrorCodeRequest.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> @@ -78,8 +74,6 @@ #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> -//_______________________________________________ -// includes of an other project #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/syswin.hxx> diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index 8ea6674092ed..3692a2bcebcc 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -//_________________________________________________________________________________________________________________ -// includes of my own project -//_________________________________________________________________________________________________________________ #include <macros/registration.hxx> /*================================================================================================================= diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 9d176757b89d..abfc12533749 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// includes of my own project -//_________________________________________________________________________________________________________________ #include <macros/registration.hxx> /*================================================================================================================= diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 8b77dd39109d..0296de35081c 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -//_________________________________________________________________________________________________________________ -// includes of my own project -//_________________________________________________________________________________________________________________ #include <macros/registration.hxx> /*================================================================================================================= diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index a5e2bd2c890d..6131fb5ce573 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -30,8 +30,6 @@ #include "services/autorecovery.hxx" #include <loadenv/loadenv.hxx> -//_______________________________________________ -// own includes #include <loadenv/targethelper.hxx> #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> @@ -45,8 +43,6 @@ #include "helper/mischelper.hxx" -//_______________________________________________ -// interface includes #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XLoadable.hpp> @@ -77,8 +73,6 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> -//_______________________________________________ -// other includes #include <comphelper/componentcontext.hxx> #include <comphelper/configurationhelper.hxx> #include <comphelper/mediadescriptor.hxx> diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index ff10901c7752..89a3f941f4bb 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -31,8 +31,6 @@ #include "backingwindow.hxx" -//_______________________________________________ -// own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <classes/droptargetlistener.hxx> @@ -42,8 +40,6 @@ #include <helpid.hrc> -//_______________________________________________ -// interface includes #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -55,8 +51,6 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> -//_______________________________________________ -// other includes #include <comphelper/componentcontext.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/factory.hxx> diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 3a46189d970e..27721a345b55 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -26,22 +26,15 @@ * ************************************************************************/ - -//_______________________________________________ -// my own includes #include <services/dispatchhelper.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> -//_______________________________________________ -// includes of other projects #include <comphelper/componentcontext.hxx> //_______________________________________________ diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 99753a7b6a7e..3fc13c543bfe 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <services/license.hxx> #include <threadhelp/resetableguard.hxx> #include <macros/debug.hxx> @@ -39,10 +35,6 @@ #include "services/licensedlg.hxx" #include "classes/resource.hrc" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -51,11 +43,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/lang/XComponent.hpp> - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index ef9e3a219bca..4f3d43915ac3 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <services/mediatypedetectionhelper.hxx> #include <services.h> #include <svl/inettype.hxx> @@ -37,10 +33,6 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 3de4348eb06d..a9de0ac2e417 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// ______________________________________________ -// my own includes - /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ @@ -40,8 +37,6 @@ #include "helper/mischelper.hxx" -// ______________________________________________ -// interface includes #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/XProperty.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -50,8 +45,6 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/PathSubstitution.hpp> -// ______________________________________________ -// includes of other projects #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 3c7fdfcd5e8e..8bc3ff7bbe8d 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -//_______________________________________________ -// my own includes - #include <services/sessionlistener.hxx> #include <services/desktop.hxx> #include <threadhelp/readguard.hxx> @@ -65,15 +62,11 @@ #include <unotools/pathoptions.hxx> #include <unotools/internaloptions.hxx> #include <stdio.h> -//_______________________________________________ -// interface includes + #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -//_______________________________________________ -// includes of other projects -//_______________________________________________ // namespace using namespace com::sun::star::uno; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3e58f9431021..b0a81402aba2 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -26,23 +26,13 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "services/substitutepathvars.hxx" #include <threadhelp/resetableguard.hxx> #include <helper/networkdomain.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/configmgr.hxx> diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 94a79fc7372b..6ea5dd16edbd 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -26,28 +26,15 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <services/tabwindowservice.hxx> #include <classes/fwktabwindow.hxx> #include <threadhelp/resetableguard.hxx> #include <services.h> #include <properties.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <toolkit/helper/vclunohelper.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index fc1ee34366cb..56a308f88045 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -28,8 +28,6 @@ #include "services/taskcreatorsrv.hxx" -//_______________________________________________ -// own includes #include <helper/persistentwindowstate.hxx> #include <helper/tagwindowasmodified.hxx> #include <helper/titlebarupdate.hxx> @@ -38,8 +36,6 @@ #include <loadenv/targethelper.hxx> #include <services.h> -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -49,8 +45,6 @@ #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> -//_______________________________________________ -// other includes #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 0d9676e61f01..7a7c73088513 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -26,22 +26,11 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <services/urltransformer.hxx> #include <threadhelp/resetableguard.hxx> #include <macros/debug.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 337c6e707c2a..d1b287492639 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -29,22 +29,14 @@ #include <tabwin/tabwindow.hxx> #include <properties.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/WindowDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ + #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 704fc2c50aa9..a3d7815fd7ce 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -29,22 +29,13 @@ #include <tabwin/tabwinfactory.hxx> #include <tabwin/tabwindow.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index a76237b629db..de8304da6534 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -26,17 +26,10 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uiconfiguration/globalsettings.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -45,9 +38,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index faa39cd7d675..63efeda5dfb1 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -19,14 +19,6 @@ #include <uiconfiguration/graphicnameaccess.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <comphelper/sequence.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index b4d4efa76133..e6912d99be60 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -36,9 +36,6 @@ #include "properties.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -48,10 +45,6 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/ui/ImageType.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index c97cacd3d76b..ea4dd1191f4b 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -35,9 +35,6 @@ #include "properties.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -47,10 +44,6 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/ui/ImageType.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 7f73540dfab6..29eb9d03b786 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -37,9 +37,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -48,9 +45,6 @@ #include <stdtypes.h> #include <uiconfiguration/imagetype.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -63,9 +57,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/ui/XImageManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 390ba4d39740..899e20236c39 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -37,9 +37,6 @@ #include "properties.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -52,10 +49,6 @@ #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 773b1cebfa15..0753e9d45e96 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -30,9 +30,6 @@ #include <threadhelp/resetableguard.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -42,9 +39,6 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/embed/XPackageStructureCreator.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index ed56814c77a8..0b9cfce04f1b 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -37,9 +37,6 @@ #include <framework/statusbarconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -48,10 +45,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XStream.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 8b95946b62f4..18ed4445d477 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uiconfiguration/uicategorydescription.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -39,18 +34,12 @@ #include "helper/mischelper.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> #include <unotools/configmgr.hxx> diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 9132b2956b9b..3d0f96253b24 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -37,9 +37,6 @@ #include <framework/statusbarconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -50,10 +47,6 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index f9d635d23089..8a38346e391d 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -26,19 +26,12 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uiconfiguration/windowstateconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" #include "helper/mischelper.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <tools/debug.hxx> diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index c661727d2fcb..ad1ddc476da2 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -29,11 +29,6 @@ #include <uielement/addonstoolbarmanager.hxx> #include <uielement/toolbarmerger.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - - #include <uielement/toolbar.hxx> #include <uielement/generictoolbarcontroller.hxx> #include <threadhelp/resetableguard.hxx> @@ -52,9 +47,6 @@ #include <uielement/dropdownboxtoolbarcontroller.hxx> #include <uielement/toolbarmerger.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -64,9 +56,6 @@ #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> #include <toolkit/unohlp.hxx> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index b4affd0192d9..39085600f75d 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -26,12 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - - #include <uielement/addonstoolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> #include <framework/actiontriggerhelper.hxx> @@ -41,9 +35,6 @@ #include <uielement/toolbar.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -53,10 +44,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <toolkit/unohlp.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 172f872f8996..e964d30127de 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/buttontoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -47,10 +40,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/XPropertySet.hpp" -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <rtl/uri.hxx> #include <osl/mutex.hxx> #include <comphelper/componentcontext.hxx> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 32658f3c7190..0618fa622c79 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/comboboxtoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,9 +40,6 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/util/Color.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 0c4c786e881b..2e8a8027d5d4 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/complextoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -48,9 +41,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/componentcontext.hxx> #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 316acef26740..909ed877d31b 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -29,15 +29,9 @@ #include <sal/macros.h> #include <uielement/controlmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -46,10 +40,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 1b2f2f34aa31..b9bb4f68a224 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/dropdownboxtoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -46,9 +39,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 0afdab7b33fc..7f67c45690af 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/edittoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -46,9 +39,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 2c2177bf4a00..78f8b7f35cf5 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -28,25 +28,14 @@ #include <uielement/fontmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index eaa44efa067f..6506edd44b5c 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -28,25 +28,15 @@ #include <uielement/fontsizemenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/view/XPrintable.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <tools/mapunit.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 6db6ddf1eb87..971eebb26239 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -19,17 +19,11 @@ #include <uielement/footermenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <classes/resource.hrc> #include <classes/fwlresid.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -39,10 +33,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index d5960e40fb50..554129296eb7 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -29,15 +29,8 @@ #include "uielement/generictoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -47,9 +40,6 @@ #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/componentcontext.hxx> #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 103e155f4683..449d0fc96f82 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -28,18 +28,12 @@ #include <uielement/headermenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <classes/resource.hrc> #include <classes/fwlresid.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -48,10 +42,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 3d47d4c4d2c8..f7d39231d665 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -29,15 +29,9 @@ #include "uielement/imagebuttontoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <framework/addonsoptions.hxx> #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -46,10 +40,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/XPropertySet.hpp" -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <rtl/uri.hxx> #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 5bac99419694..1dc52ed35cf3 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -29,24 +29,14 @@ #include <uielement/langselectionmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 62fbf53817ed..3d8bc974d3af 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/menubarmanager.hxx> #include <framework/menuconfiguration.hxx> #include <framework/bmkmenu.hxx> @@ -45,9 +40,6 @@ #include <classes/resource.hrc> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -71,9 +63,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/util/URLTransformer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 5c97bf181a44..32ec827a3d08 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -26,18 +26,11 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/menubarwrapper.hxx> #include <threadhelp/resetableguard.hxx> #include <framework/actiontriggerhelper.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> @@ -48,9 +41,6 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <tools/solar.h> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 8918b1f34f2f..7a8ff0bfe097 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -28,9 +28,6 @@ #include <uielement/newmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <classes/resource.hrc> @@ -39,9 +36,6 @@ #include <framework/imageproducer.hxx> #include <framework/menuconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -51,9 +45,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 668840b783ca..2028be895116 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -28,15 +28,9 @@ #include <uielement/objectmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -44,10 +38,6 @@ #include <com/sun/star/embed/VerbAttributes.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index e8fddb76324b..906147ea13fe 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -29,22 +29,13 @@ #include <uielement/progressbarwrapper.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <helper/statusindicator.hxx> #include <threadhelp/resetableguard.hxx> #include <uielement/statusindicatorinterfacewrapper.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 9d29d010f453..c93dfe65134c 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -28,25 +28,16 @@ #include <uielement/recentfilesmenucontroller.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <classes/resource.hrc> #include <classes/fwkresid.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/util/XStringWidth.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 2560270e67d9..6fec68dac1b0 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -32,15 +32,8 @@ #include "uielement/spinfieldtoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 0bbd731b75e7..438099a43097 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -28,14 +28,6 @@ #include <uielement/statusbar.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> namespace framework diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index f726f32d2a40..692c81dc07e0 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -29,9 +29,6 @@ #include <uielement/statusbarmanager.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> #include <framework/sfxhelperfunctions.hxx> @@ -44,9 +41,6 @@ #include "properties.h" #include <helper/mischelper.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/util/XUpdatable.hpp> @@ -57,10 +51,6 @@ #include <com/sun/star/awt/Command.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <toolkit/unohlp.hxx> #include <svtools/statusbarcontroller.hxx> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index beb14e2c85e4..1313be9b21d6 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -29,9 +29,6 @@ #include <uielement/statusbarwrapper.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> @@ -39,9 +36,6 @@ #include <uielement/statusbar.hxx> #include <helpid.hrc> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> @@ -50,9 +44,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <toolkit/unohlp.hxx> diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index a3630daf11df..e5250ed4486f 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -17,18 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/statusindicatorinterfacewrapper.hxx> #include <uielement/progressbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/svapp.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index e10291836956..505b3f0d4185 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -29,15 +29,9 @@ #include "uielement/togglebuttontoolbarcontroller.hxx" -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <framework/addonsoptions.hxx> #include "uielement/toolbar.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -46,10 +40,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/XPropertySet.hpp" -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <rtl/uri.hxx> #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx index f318d3f0ac8a..d1e5ddab4126 100644 --- a/framework/source/uielement/toolbar.cxx +++ b/framework/source/uielement/toolbar.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/toolbar.hxx> #include <uielement/toolbarmanager.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index a4eed099fab6..fde16c83ad5c 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -28,11 +28,6 @@ #include <uielement/toolbarmanager.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - - #include <uielement/toolbar.hxx> #include <uielement/generictoolbarcontroller.hxx> #include <threadhelp/resetableguard.hxx> @@ -46,9 +41,6 @@ #include <framework/addonsoptions.hxx> #include <uielement/toolbarmerger.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -69,9 +61,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/URLTransformer.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> #include <unotools/cmdoptions.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 0b728b5a0959..5d479a552060 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -30,9 +30,6 @@ #include <algorithm> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <classes/resource.hrc> @@ -41,9 +38,6 @@ #include <framework/imageproducer.hxx> #include <framework/sfxhelperfunctions.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> @@ -56,10 +50,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/UIElementType.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 212884d24b76..ea0d31675900 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - - #include <uielement/toolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> #include <framework/actiontriggerhelper.hxx> @@ -40,9 +35,6 @@ #include <uielement/toolbar.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> @@ -52,10 +44,6 @@ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <toolkit/unohlp.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 29edf6aa6312..4715e1c1a453 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uielement/uicommanddescription.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -38,18 +34,12 @@ #include "helper/mischelper.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> #include <unotools/configmgr.hxx> diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 06841b59d4b8..21ca8c1a9909 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -28,15 +28,9 @@ #include <uifactory/addonstoolboxfactory.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/addonstoolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -45,9 +39,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index cbfb934e6e63..d029b849f013 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -26,28 +26,18 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uifactory/factoryconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" #include "helper/mischelper.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 7686b9535089..e221e9a5459f 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -28,16 +28,10 @@ #include <uifactory/menubarfactory.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <uielement/menubarwrapper.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -46,10 +40,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index cf01bcc253d2..e98f03e91464 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -17,27 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uifactory/popupmenucontrollerfactory.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" #include "uifactory/factoryconfiguration.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx index 461a0da30785..3de5b25245ab 100644 --- a/framework/source/uifactory/statusbarcontrollerfactory.cxx +++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx @@ -17,27 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uifactory/statusbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 6be9cefa155b..7f2fce4714e0 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -20,15 +20,9 @@ #include <uifactory/statusbarfactory.hxx> #include <uifactory/menubarfactory.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/statusbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -37,9 +31,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 2369605b6e3e..5651159be7dd 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -26,27 +26,17 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include "uifactory/toolbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index ab2f54a9db23..a30a1c3737a2 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -19,15 +19,9 @@ #include <uifactory/toolboxfactory.hxx> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/toolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -36,9 +30,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index b8d31e3bcaf0..f6d55dbe40fb 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uifactory/uielementfactorymanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> #include <threadhelp/resetableguard.hxx> @@ -37,9 +33,6 @@ #include "helper/mischelper.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -47,9 +40,6 @@ #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/frame/XFrame.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 320026c517be..b9691a5c92fd 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -26,18 +26,11 @@ * ************************************************************************/ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uifactory/windowcontentfactorymanager.hxx> #include <uifactory/uielementfactorymanager.hxx> #include <threadhelp/resetableguard.hxx> #include "services.h" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -48,9 +41,6 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 47ce04ac6397..934181f8b4d7 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -28,21 +28,14 @@ #include <xml/acceleratorconfigurationreader.hxx> -//_______________________________________________ -// own includes - #include <acceleratorconst.h> -//_______________________________________________ -// interface includes #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/container/ElementExistException.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 9d1a9748addd..aaef32458ebc 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -28,19 +28,13 @@ #include <xml/acceleratorconfigurationwriter.hxx> -//_______________________________________________ -// own includes #include <acceleratorconst.h> #include <threadhelp/readguard.hxx> -//_______________________________________________ -// interface includes #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/awt/KeyModifier.hpp> -//_______________________________________________ -// other includes #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 1823283bff2b..40a61e3a0d4b 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -33,18 +33,11 @@ #include <xml/imagesdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index f613e17d4b19..e5c393b6ba5f 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -29,23 +29,12 @@ #include <stdio.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/resetableguard.hxx> #include <xml/imagesdocumenthandler.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <rtl/ustrbuf.hxx> |