diff options
Diffstat (limited to 'framework/inc')
165 files changed, 0 insertions, 1347 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index cce8a9d1b507..ef52d0ca4577 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -20,16 +20,8 @@ #ifndef _FRAMEWORK_ACCELERATORCONST_H_ #define _FRAMEWORK_ACCELERATORCONST_H_ -//_______________________________________________ -// own includes - #include <general.h> -//_______________________________________________ -// interface includes - -//_______________________________________________ -// other includes namespace framework{ diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 1948d1d118f2..8f9f062853e5 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -20,19 +20,8 @@ #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ #define __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <sal/types.h> #include <iterator> diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 5e15a6525195..e3394c791809 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -29,20 +29,9 @@ #ifndef __FRAMEWORK_CLASSES_CONVERTER_HXX_ #define __FRAMEWORK_CLASSES_CONVERTER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx index 3a0ac10d50d0..620b76b7c762 100644 --- a/framework/inc/classes/droptargetlistener.hxx +++ b/framework/inc/classes/droptargetlistener.hxx @@ -20,23 +20,12 @@ #ifndef __FRAMEWORK_CLASSES_DROPTARGETLISTENER_HXX_ #define __FRAMEWORK_CLASSES_DROPTARGETLISTENER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/frame/XFrame.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <sot/exchange.hxx> diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 9346cc00c821..8922cfb096d1 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -27,10 +27,6 @@ #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ #define __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/filtercachedata.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -38,9 +34,6 @@ #include <general.h> #include <queries.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #ifdef ENABLE_GENERATEFILTERCACHE diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 276d5da11f0f..437b509a7999 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -36,9 +36,6 @@ #include <vector> #include <iterator> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <classes/checkediterator.hxx> #include <classes/wildcard.hxx> #include <classes/converter.hxx> @@ -47,9 +44,6 @@ #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -58,9 +52,6 @@ #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 3271a456e1f5..66f25119d60c 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -36,25 +36,16 @@ #include <stdexcept> #include <algorithm> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/transactionbase.hxx> #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/uno/Reference.hxx> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> #include <vcl/evntpost.hxx> diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 3ac4588879b4..aa7ae93a4af7 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -34,18 +34,12 @@ */ #include <vector> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <vcl/menu.hxx> #include <vcl/accel.hxx> diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index be7eb00642dd..a02113d0b95a 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -20,26 +20,18 @@ #ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_ #define __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/transactionbase.hxx> #include <macros/debug.hxx> #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/PropertyExistException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> -//_________________________________________________________________________________________________________________ -// other includes - #include <cppuhelper/weakref.hxx> #include <fwidllapi.h> diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index f9f3be641008..4c008872f94b 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -29,23 +29,12 @@ #ifndef __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_ #define __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <general.h> #include <stdtypes.h> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/URL.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <unotools/configitem.hxx> #include <rtl/ustring.hxx> #include <fwidllapi.h> diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index 36378c0e278e..f2c8ab43e60f 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -20,24 +20,14 @@ #ifndef __FRAMEWORK_CLASSES_TASKCREATOR_HXX_ #define __FRAMEWORK_CLASSES_TASKCREATOR_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index b64245a2bddb..5321aec959a6 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -20,19 +20,8 @@ #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_ #define __FRAMEWORK_CLASSES_WILDCARD_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index c273274fd0aa..88a0ad3452f0 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -40,8 +37,6 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -52,8 +47,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -//_______________________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <vcl/evntpost.hxx> diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index 6fbf8c0bce76..64acfd1a79d3 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -20,26 +20,16 @@ #ifndef __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_ #define __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index b783db5106ae..7d6056a86cf3 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_ #define __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <services/frame.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> @@ -31,9 +27,6 @@ #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> @@ -42,9 +35,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <tools/wldcrd.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index c89b56cb855f..c06b31faae1a 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -42,9 +38,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -53,9 +46,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 43f32cedddb8..01d1e2d8372c 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/taskcreator.hxx> #include <services/frame.hxx> #include <macros/generic.hxx> @@ -44,9 +40,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URL.hpp> @@ -59,9 +52,6 @@ #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index afb4ae114608..4659c564000e 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_ #define __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> #include <macros/xinterface.hxx> @@ -33,9 +30,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -45,9 +39,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/URL.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 91f44142e2cc..23741dd78c0c 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <services/frame.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -32,9 +28,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,9 +45,6 @@ #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XUriReference.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index dc7841af247c..78f15c1c1136 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_ #define __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -42,9 +38,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -53,9 +46,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 44492dc006a7..e8cbe9d1ba31 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_ #define __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -31,8 +28,6 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -43,8 +38,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -//_______________________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <vcl/evntpost.hxx> diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index d16f97a3b564..ed9539ec7701 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_ #define __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -42,9 +38,6 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -53,9 +46,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index fc279d9dac3d..50a5de3862d7 100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_ #define __FRAMEWORK_DISPATCHCOMMANDS_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index 0cef42caba0e..2bb0b9673aea 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -28,18 +28,10 @@ #ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_ #define __FRAMEWORK_CLASSES_ADDONMENU_HXX_ -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <vcl/menu.hxx> #include <framework/fwedllapi.h> diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index 08c55185db0a..0cf56e479e39 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -28,10 +28,6 @@ #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ #define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <sal/types.h> #include <osl/mutex.hxx> #include <vcl/image.hxx> diff --git a/framework/inc/framework/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx index de3621eeaa32..b3fed8609a0f 100644 --- a/framework/inc/framework/bmkmenu.hxx +++ b/framework/inc/framework/bmkmenu.hxx @@ -29,15 +29,9 @@ #define __FRAMEWORK_CLASSES_BMKMENU_HXX #include "framework/addonmenu.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> #include <vcl/image.hxx> diff --git a/framework/inc/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx index 3e9f0dcb4b96..d992cfe3bdf4 100644 --- a/framework/inc/framework/framelistanalyzer.hxx +++ b/framework/inc/framework/framelistanalyzer.hxx @@ -20,12 +20,8 @@ #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ #define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ -//_______________________________________________ -// interface includes #include <com/sun/star/frame/XFrame.hpp> -//_______________________________________________ -// other includes #include <framework/fwedllapi.h> //_______________________________________________ diff --git a/framework/inc/framework/iguard.hxx b/framework/inc/framework/iguard.hxx index 2ebb5260e72c..7a14aed6a248 100644 --- a/framework/inc/framework/iguard.hxx +++ b/framework/inc/framework/iguard.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_THREADHELP_IGUARD_H_ #define __FRAMEWORK_THREADHELP_IGUARD_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <sal/types.h> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx index 9010af0cf10e..5e7de248c6d5 100644 --- a/framework/inc/framework/imageproducer.hxx +++ b/framework/inc/framework/imageproducer.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ #define __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <sal/types.h> #include <com/sun/star/frame/XFrame.hpp> #include <vcl/image.hxx> diff --git a/framework/inc/framework/imutex.hxx b/framework/inc/framework/imutex.hxx index 862dfaaabe42..2de825a357af 100644 --- a/framework/inc/framework/imutex.hxx +++ b/framework/inc/framework/imutex.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_ #define __FRAMEWORK_THREADHELP_IMUTEX_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <sal/types.h> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx index bc56676d7d73..277bb855ef1c 100644 --- a/framework/inc/framework/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -31,9 +31,6 @@ #include <com/sun/star/document/AmbigousFilterRequest.hpp> #include <com/sun/star/uno/RuntimeException.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index e4b2f4b63c95..720a657838b8 100644 --- a/framework/inc/framework/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ #define __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -43,10 +39,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <cppuhelper/weak.hxx> #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index da9e8366a9e2..09a14ec41e69 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -30,22 +30,13 @@ #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <vector> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index 2fe67979d582..67746c91f538 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -29,9 +29,6 @@ #ifndef _FRAMEWORK_TITLEHELPER_HXX_ #define _FRAMEWORK_TITLEHELPER_HXX_ -//_______________________________________________ -// includes - #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/framework/inc/general.h b/framework/inc/general.h index f674a3039644..dafddfba082d 100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_GENERAL_H_ #define __FRAMEWORK_GENERAL_H_ -//============================================================================= -// includes - #include <macros/generic.hxx> /* Normaly XInterface isnt used here ... diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index 5ae0b0186966..6f062a8639d0 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_ #define __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/framecontainer.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -31,15 +27,9 @@ #include <macros/xtypeprovider.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/frame/XFrame.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 7aedfd40b92c..45007f8e0e5d 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_ #define __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -31,9 +27,6 @@ #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XElementAccess.hpp> @@ -41,9 +34,6 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XComponent.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 4c73c1720242..a95642ea28f8 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_ #define __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -31,16 +27,10 @@ #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XComponent.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 1de47d1e243c..2cd37a127362 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_ #define __FRAMEWORK_HELPER_OFRAMES_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/framecontainer.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -41,16 +37,10 @@ #include <macros/debug.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFrame.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index aff3436bfc52..a883b0fac223 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -20,28 +20,18 @@ #ifndef __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_ #define __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/lang/XEventListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <unotools/moduleoptions.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 9de0c6c9d41b..79ffeb21a103 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -20,19 +20,12 @@ #ifndef __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_ #define __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -40,9 +33,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 86c52f23fc28..00c38a74d8be 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ #define __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> @@ -43,10 +39,6 @@ #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -61,10 +53,6 @@ #include <com/sun/star/lang/XEventListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <unotools/moduleoptions.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 1785b83d8dd1..2351e65fa8ba 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -20,18 +20,11 @@ #ifndef __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_ #define __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> @@ -43,9 +36,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 63db18827691..c610fcefac06 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -20,27 +20,17 @@ #ifndef __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_ #define __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XUpdatable.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 633f5b724801..a76c6be21ce5 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -20,22 +20,15 @@ #ifndef __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_ #define __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_ -//----------------------------------------------- -// includes of own modules - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <general.h> -//----------------------------------------------- -// includes of interfaces #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XWindow.hpp> -//----------------------------------------------- -// includes of external modules #include <cppuhelper/weak.hxx> #include <vcl/status.hxx> diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 03afd79689c3..829f531a0ca0 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -20,24 +20,14 @@ #ifndef __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_ #define __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 682f45709a21..2ba4b89769d0 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -20,19 +20,12 @@ #ifndef __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_ #define __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_ -//_______________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_______________________________________ -// other includes #include <rtl/ustring.hxx> #include <fwidllapi.h> diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index f7acd7be11ae..d0e58fb862f6 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -20,20 +20,13 @@ #ifndef __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_ #define __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//_______________________________________________ -// other includes #include <cppuhelper/implbase3.hxx> -//_______________________________________________ -// uno includes #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 6d55a7ca9235..ac48d64809b7 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_JOBS_JOB_HXX_ #define __FRAMEWORK_JOBS_JOB_HXX_ -//_______________________________________ -// my own includes - #include <jobs/jobresult.hxx> #include <jobs/jobdata.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -32,8 +29,6 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -43,8 +38,6 @@ #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -//_______________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 6240390b46d2..ebf55719ac84 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -20,17 +20,9 @@ #ifndef __FRAMEWORK_JOBS_JOBCONST_HXX_ #define __FRAMEWORK_JOBS_JOBCONST_HXX_ -//_______________________________________ -// my own includes - #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes - -//_______________________________________ -// other includes #include <rtl/ustring.hxx> #include <fwidllapi.h> diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 5ff287d21116..86df0702f8dc 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_JOBS_JOBDATA_HXX_ #define __FRAMEWORK_JOBS_JOBDATA_HXX_ -//_______________________________________ -// my own includes - #include <jobs/configaccess.hxx> #include <jobs/jobresult.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -30,14 +27,10 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -//_______________________________________ -// other includes #include <rtl/ustring.hxx> //_______________________________________ diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx index 112db2da60ee..0eb800e292de 100644 --- a/framework/inc/jobs/jobdispatch.hxx +++ b/framework/inc/jobs/jobdispatch.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_JOBS_JOBDISPATCH_HXX_ #define __FRAMEWORK_JOBS_JOBDISPATCH_HXX_ -//_______________________________________ -// my own includes - #include <jobs/configaccess.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> @@ -32,8 +29,6 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -49,8 +44,6 @@ #include <com/sun/star/frame/DispatchResultEvent.hpp> #include <com/sun/star/lang/XInitialization.hpp> -//_______________________________________ -// other includes #include <unotools/configpaths.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index 114e70d86ea5..6e05c893f333 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_ #define __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_ -//_______________________________________ -// my own includes - #include <jobs/configaccess.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> @@ -41,8 +38,6 @@ #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -51,8 +46,6 @@ #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_______________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index c22e9e4267df..f6b6aef2dec7 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -20,21 +20,14 @@ #ifndef __FRAMEWORK_JOBS_JOBRESULT_HXX_ #define __FRAMEWORK_JOBS_JOBRESULT_HXX_ -//_______________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -//_______________________________________ -// other includes #include <rtl/ustring.hxx> //_______________________________________ diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index f22f8f67f1e5..c1db8f8dc0e8 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -20,19 +20,11 @@ #ifndef __FRAMEWORK_JOBS_JOBURL_HXX_ #define __FRAMEWORK_JOBS_JOBURL_HXX_ -//_______________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <stdtypes.h> #include <general.h> -//_______________________________________ -// interface includes - -//_______________________________________ -// other includes #include <rtl/ustring.hxx> //_______________________________________ diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index df31cca04549..e28bf201c5cd 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -20,20 +20,13 @@ #ifndef __FRAMEWORK_JOBS_SHELLJOB_HXX_ #define __FRAMEWORK_JOBS_SHELLJOB_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//_______________________________________________ -// other includes #include <cppuhelper/implbase2.hxx> -//_______________________________________________ -// uno includes #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index b13505ed1ccc..7e4db9322ce7 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ #define __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS ) #ifndef _OSL_DIAGNOSE_H_ diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx index 9cfe0bdebc33..38e38765cec3 100644 --- a/framework/inc/macros/debug/event.hxx +++ b/framework/inc/macros/debug/event.hxx @@ -26,10 +26,6 @@ #ifdef ENABLE_EVENTDEBUG - //_________________________________________________________________________________________________________________ - // includes - //_________________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx index fe64edf67145..ffcc4413097c 100644 --- a/framework/inc/macros/debug/filterdbg.hxx +++ b/framework/inc/macros/debug/filterdbg.hxx @@ -28,10 +28,6 @@ #ifdef ENABLE_FILTERDBG - //_________________________________________________________________________________________________________________ - // includes - //_________________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx index f830afdabf62..59c177a5ddad 100644 --- a/framework/inc/macros/debug/logmechanism.hxx +++ b/framework/inc/macros/debug/logmechanism.hxx @@ -26,10 +26,6 @@ #ifdef ENABLE_LOGMECHANISM - //_____________________________________________________________________________________________________________ - // includes - //_____________________________________________________________________________________________________________ - #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> #endif diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx index 02568f4b1e93..c55ee1de1f59 100644 --- a/framework/inc/macros/debug/mutex.hxx +++ b/framework/inc/macros/debug/mutex.hxx @@ -26,10 +26,6 @@ #ifdef ENABLE_MUTEXDEBUG - //_____________________________________________________________________________________________________________ - // includes - //_____________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx index 6d422629c949..afef0c97f4b1 100644 --- a/framework/inc/macros/debug/plugin.hxx +++ b/framework/inc/macros/debug/plugin.hxx @@ -26,10 +26,6 @@ #ifdef ENABLE_PLUGINDEBUG - //_____________________________________________________________________________________________________________ - // includes - //_____________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index 66d75bb457ba..ccf2f86b8346 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -35,10 +35,6 @@ #ifdef ENABLE_REGISTRATIONDEBUG - //_____________________________________________________________________________________________________________ - // includes - //_____________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx index f334c5e47dd8..6a75d9decfe5 100644 --- a/framework/inc/macros/debug/targeting.hxx +++ b/framework/inc/macros/debug/targeting.hxx @@ -26,10 +26,6 @@ #ifdef ENABLE_TARGETINGDEBUG - //_____________________________________________________________________________________________________________ - // includes - //_____________________________________________________________________________________________________________ - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx index f30487c003db..0f0801a8eba1 100644 --- a/framework/inc/macros/generic.hxx +++ b/framework/inc/macros/generic.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #define __FRAMEWORK_MACROS_GENERIC_HXX_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <rtl/ustring.hxx> #include <rtl/textenc.h> diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index e4a3b785df13..a65fcbae5963 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -29,23 +29,12 @@ #ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_ #define __FRAMEWORK_MACROS_REGISTRATION_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 5cdfa1ef52b4..1a3d123ba3eb 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -20,19 +20,8 @@ #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #define __FRAMEWORK_MACROS_XINTERFACE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/uno/RuntimeException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Type.hxx> diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 341e167a3dc9..251b354b5134 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -29,23 +29,13 @@ #ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ #define __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 485642dbe260..4e52c1f8e0bb 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -20,20 +20,9 @@ #ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ #define __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/uno/RuntimeException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 60cb74b88529..12317aaf8124 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_PROPERTIES_H_ #define __FRAMEWORK_PROPERTIES_H_ -//_______________________________________________ -// includes - #include <macros/generic.hxx> #include <general.h> diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 88a1c2d9fe71..95228dd1dc95 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -20,15 +20,8 @@ #ifndef __FRAMEWORK_QUERIES_H_ #define __FRAMEWORK_QUERIES_H_ -//_________________________________________________________________________________________________________________ -// own includes -//_________________________________________________________________________________________________________________ - #include <general.h> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 22599b3618ee..2a5023e1bc4f 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -25,7 +25,6 @@ */ #include <vector> -// own includes #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> diff --git a/framework/inc/services.h b/framework/inc/services.h index f5ab413d0c94..41f517627402 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_H_ #define __FRAMEWORK_SERVICES_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 0e65f314b13e..4a9495dc506b 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_ #define __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_ -//_______________________________________________ -// own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -39,8 +36,6 @@ #include <general.h> #include <stdtypes.h> -//_______________________________________________ -// interface includes #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -54,8 +49,6 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/util/XModifyListener.hpp> -//_______________________________________________ -// other includes #include <comphelper/mediadescriptor.hxx> #include <vcl/timer.hxx> #include <vcl/evntpost.hxx> diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index 712e5a49a4d9..f54ef495fd03 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -20,15 +20,10 @@ #ifndef __FRAMEWORK_SERVICES_BACKINGCOMP_HXX_ #define __FRAMEWORK_SERVICES_BACKINGCOMP_HXX_ -//__________________________________________ -// own includes - #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> -//__________________________________________ -// interface includes #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -43,8 +38,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> -//__________________________________________ -// other includes #include <cppuhelper/weak.hxx> //__________________________________________ diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 6b87bdb18641..63c70dded704 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_ #define __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/filtercache.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -35,9 +31,6 @@ #include <threadhelp/transactionbase.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/util/XFlushable.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 530d615c3208..653debe596f2 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_ #define __FRAMEWORK_SERVICES_DESKTOP_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/framecontainer.hxx> #include <threadhelp/threadhelpbase.hxx> #include <helper/oframes.hxx> @@ -42,10 +38,6 @@ #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> @@ -74,9 +66,6 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <unotools/cmdoptions.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 97388744c6c8..64d429c3f95b 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_DISPATCHHELPER_HXX_ #define __FRAMEWORK_SERVICES_DISPATCHHELPER_HXX_ -//_______________________________________________ -// my own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -31,15 +28,11 @@ #include <macros/xserviceinfo.hxx> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchHelper.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -//_______________________________________________ -// other includes #include <cppuhelper/implbase3.hxx> #include <osl/conditn.hxx> diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index b6db676b7fa6..a4a8136b6eca 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_FRAME_HXX_ #define __FRAMEWORK_SERVICES_FRAME_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/framecontainer.hxx> #include <classes/propertysethelper.hxx> #include <threadhelp/resetableguard.hxx> @@ -48,9 +44,6 @@ #include <macros/xserviceinfo.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XController.hpp> @@ -79,9 +72,6 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <unotools/cmdoptions.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 09be6017aa2b..a757f261410c 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -34,9 +34,6 @@ */ #include <vector> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> #include <threadhelp/writeguard.hxx> @@ -54,9 +51,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,9 +68,6 @@ #include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase7.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx index 25df65685257..b0bb81f11f06 100644 --- a/framework/inc/services/license.hxx +++ b/framework/inc/services/license.hxx @@ -34,9 +34,6 @@ */ #include <vector> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> #include <threadhelp/writeguard.hxx> @@ -50,18 +47,12 @@ #include <stdtypes.h> #include <uielement/menubarmanager.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/CloseVetoException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index 39919ff61274..341e68ef3398 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_ #define __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -42,9 +38,6 @@ #include <services/logindialog.hrc> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> @@ -53,9 +46,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/XFlushable.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index e2ffe52e4988..5e0d2ef11bd1 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_ #define __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> @@ -31,14 +27,8 @@ #include <macros/xserviceinfo.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XStringMapping.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ // namespaces diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index 33b64b4546ea..7d5950abf501 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_ #define __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_ -//_______________________________________________ -// own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -31,8 +28,6 @@ #include <general.h> #include <stdtypes.h> -//_______________________________________________ -// interface includes #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,8 +36,6 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XContainerQuery.hpp> -//_______________________________________________ -// other includes #include <cppuhelper/weak.hxx> //_______________________________________________ diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index 36198adf2dad..d1fd967e69b2 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_ #define __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -42,18 +38,12 @@ #include <properties.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx index 1f909ae0b8dc..c6e5b40f9adb 100644 --- a/framework/inc/services/sessionlistener.hxx +++ b/framework/inc/services/sessionlistener.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_SESSIONLISTENER_HXX_ #define __FRAMEWORK_SERVICES_SESSIONLISTENER_HXX_ -//_______________________________________________ -// my own includes - #include <classes/filtercache.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -41,8 +38,6 @@ #include <macros/xserviceinfo.hxx> #include <general.h> -//_______________________________________________ -// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -55,8 +50,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> -//_______________________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index d0fe52b762e8..bb923b24c044 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -36,9 +36,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -46,17 +43,11 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> #include <unotools/configitem.hxx> diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index d0cdfe60c317..bd652ac01722 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -34,10 +34,6 @@ */ #include <vector> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <classes/fwktabwindow.hxx> #include <classes/propertysethelper.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -49,18 +45,10 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/awt/XSimpleTabController.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <cppuhelper/weak.hxx> #include <vcl/window.hxx> diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx index 1d7de6c55320..804ba4d37d2c 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/framework/inc/services/taskcreatorsrv.hxx @@ -29,9 +29,6 @@ #ifndef __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_ #define __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_ -//_______________________________________________ -// own includes - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -39,8 +36,6 @@ #include <general.h> #include <stdtypes.h> -//_______________________________________________ -// interface includes #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -49,8 +44,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/awt/Rectangle.hpp> -//_______________________________________________ -// other includes #include <cppuhelper/weak.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx index b7f193524ba2..562ef35442c7 100644 --- a/framework/inc/services/urltransformer.hxx +++ b/framework/inc/services/urltransformer.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_ #define __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -32,15 +28,9 @@ #include <macros/xserviceinfo.hxx> #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/URL.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 83754a884c28..8c99c86d1643 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -33,22 +33,12 @@ #include <queue> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// own includes -//_________________________________________________________________________________________________________________ #include <general.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> #endif -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/sequenceasvector.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 0cfe4507c048..dbd9048c3b5b 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_TABWIN_TABWINDOW_HXX_ #define __FRAMEWORK_TABWIN_TABWINDOW_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -41,9 +37,6 @@ #include <macros/xserviceinfo.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -55,9 +48,6 @@ #include <com/sun/star/awt/XSimpleTabController.hpp> #include <com/sun/star/awt/XTabListener.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx index b6afee085eef..a594b2a548a3 100644 --- a/framework/inc/tabwin/tabwinfactory.hxx +++ b/framework/inc/tabwin/tabwinfactory.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_ #define __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -32,9 +28,6 @@ #include <macros/xserviceinfo.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -42,9 +35,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/XToolkit.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx index 7046229e2034..a8250d32efb1 100644 --- a/framework/inc/threadhelp/fairrwlock.hxx +++ b/framework/inc/threadhelp/fairrwlock.hxx @@ -20,22 +20,12 @@ #ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_ #define __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/inoncopyable.h> #include <threadhelp/irwlock.h> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/XInterface.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <osl/conditn.hxx> diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index 9fbcbc8aaeef..3a41f781d38f 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -20,20 +20,9 @@ #ifndef __FRAMEWORK_THREADHELP_GATE_HXX_ #define __FRAMEWORK_THREADHELP_GATE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/inoncopyable.h> #include <threadhelp/igate.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <osl/conditn.hxx> diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h index 7dc1cfa60cb1..b7b0d7d01495 100644 --- a/framework/inc/threadhelp/igate.h +++ b/framework/inc/threadhelp/igate.h @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_THREADHELP_IGATE_H_ #define __FRAMEWORK_THREADHELP_IGATE_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <osl/time.h> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h index 72c2b3f6506e..7929f1ad4464 100644 --- a/framework/inc/threadhelp/inoncopyable.h +++ b/framework/inc/threadhelp/inoncopyable.h @@ -21,18 +21,6 @@ #define __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ //_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h index 22363c7b7113..27d6c04dbd9d 100644 --- a/framework/inc/threadhelp/irwlock.h +++ b/framework/inc/threadhelp/irwlock.h @@ -30,10 +30,6 @@ #define __FRAMEWORK_THREADHELP_IRWLOCK_H_ //_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h index 5e70ebdc6771..305b480763d0 100644 --- a/framework/inc/threadhelp/itransactionmanager.h +++ b/framework/inc/threadhelp/itransactionmanager.h @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_ #define __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_ -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - #include <general.h> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index eaaf73f4f69f..70fb55cd75cb 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -29,22 +29,11 @@ #ifndef __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_ #define __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/inoncopyable.h> #include <framework/imutex.hxx> #include <threadhelp/irwlock.h> #include <threadhelp/fairrwlock.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <fwidllapi.h> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx index c1063a04ffcc..71435c1c4197 100644 --- a/framework/inc/threadhelp/threadhelpbase.hxx +++ b/framework/inc/threadhelp/threadhelpbase.hxx @@ -29,21 +29,9 @@ #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #define __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/lockhelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx index e11c2718f651..6157a337db96 100644 --- a/framework/inc/threadhelp/transactionbase.hxx +++ b/framework/inc/threadhelp/transactionbase.hxx @@ -20,21 +20,9 @@ #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_ #define __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/transactionmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index c7d03e3d26fc..7f0dc7ff629b 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -20,22 +20,10 @@ #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ #define __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/inoncopyable.h> #include <threadhelp/itransactionmanager.h> //_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index 462e66069b51..e5b28d1e7871 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -20,26 +20,16 @@ #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_ #define __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/inoncopyable.h> #include <threadhelp/itransactionmanager.h> #include <threadhelp/gate.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <fwidllapi.h> diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 6f581173b294..49f39b1f3ca7 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -27,9 +27,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -37,16 +34,10 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index d1e668d40e85..ebcc847f83b6 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -22,9 +22,6 @@ #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index e980b3af293e..dba73cb546f6 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -29,9 +29,6 @@ #include <boost/unordered_map.hpp> #include <memory> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -40,9 +37,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> @@ -55,9 +49,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/ui/XImageManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 315f8143685c..28137a05f2a6 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -38,9 +38,6 @@ #include <boost/unordered_map.hpp> #include <memory> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -49,9 +46,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> @@ -64,9 +58,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/ui/XImageManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index 26c3347f9a80..208c6308669d 100644 --- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.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> @@ -47,9 +44,6 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -59,9 +53,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index 86be656196d1..51012143a109 100644 --- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -37,9 +37,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <accelerators/presethandler.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -49,9 +46,6 @@ #include <stdtypes.h> #include <uiconfiguration/moduleimagemanager.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -65,9 +59,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx index 9cb15d29ae44..028452fb300b 100644 --- a/framework/inc/uiconfiguration/uicategorydescription.hxx +++ b/framework/inc/uiconfiguration/uicategorydescription.hxx @@ -27,27 +27,17 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xserviceinfo.hxx> #include <uielement/uicommanddescription.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - namespace framework { class UICategoryDescription : public UICommandDescription diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index ccb2eaeaeb0d..4365266840e4 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.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/imagemanager.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/ui/UIElementType.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index 7c485107b8c9..296c106f973d 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -36,9 +36,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -46,17 +43,11 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 662b6ab7a2ed..d4d4946f61b9 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -29,19 +29,12 @@ #ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_ #define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <uielement/toolbarmanager.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -50,9 +43,6 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index 178d35c16a8e..310eaf6a406a 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -20,23 +20,12 @@ #ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_ #define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <helper/uielementwrapperbase.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index b5685a39e9b9..7e7de4eebdb1 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -33,10 +33,6 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/weak.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 16cc47ac8aff..db0fb1c97287 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -20,17 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_ #define __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/generic.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <tools/solar.h> namespace framework diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index e6d2c27aac21..badf136e1cc2 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -26,9 +26,6 @@ #include <com/sun/star/frame/ControlCommand.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 94527830000d..b992bc63c1f3 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -29,18 +29,11 @@ #ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_ #define __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx index 3f877f3bafc6..4a3f830cebfa 100644 --- a/framework/inc/uielement/controlmenucontroller.hxx +++ b/framework/inc/uielement/controlmenucontroller.hxx @@ -29,16 +29,9 @@ #ifndef __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -50,9 +43,6 @@ #include <com/sun/star/frame/status/Verb.hpp> #include <com/sun/star/frame/XModel.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index c38dba3c5c73..a002450fa64d 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -33,10 +33,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <uielement/complextoolbarcontroller.hxx> #include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 46e2ff091edb..f2c573c08b37 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -33,10 +33,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <uielement/complextoolbarcontroller.hxx> #include <vcl/toolbox.hxx> #include <vcl/edit.hxx> diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index b8b2286d3378..472839422c3b 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -39,9 +32,6 @@ #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 6bf4d1f1c7d7..c8752d4b6e28 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -40,9 +33,6 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index 4eaf6680605c..bfc935f644c0 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <uielement/headermenucontroller.hxx> namespace framework diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index 851073c16b12..ba4177bfa9c6 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <svtools/toolboxcontroller.hxx> #include <vcl/toolbox.hxx> #include <memory> diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index e918d78e4ebc..3a6613e87b31 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -41,9 +34,6 @@ #include <com/sun/star/frame/status/Verb.hpp> #include <com/sun/star/frame/XModel.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 4cbbc5465fa0..2d9dd37b489d 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -24,10 +24,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <uielement/complextoolbarcontroller.hxx> #include <vcl/toolbox.hxx> #include <vcl/image.hxx> diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 159d6a5f6e5a..ab7890c37c7c 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -29,26 +29,16 @@ #ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_ #define __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <helper/shareablemutex.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index d72abdbc4046..e6eb10133847 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -40,9 +33,6 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 683670782718..bb90ae0c0c5b 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -34,16 +34,10 @@ */ #include <vector> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -63,9 +57,6 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <vcl/menu.hxx> #include <vcl/accel.hxx> diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index ef4518cb1644..47bfcce26d02 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -20,26 +20,15 @@ #ifndef __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_ #define __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <helper/uiconfigelementwrapperbase.hxx> #include <uielement/menubarmanager.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <boost/unordered_map.hpp> namespace framework diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index f3c7b1b926ea..7954844f1bb8 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -29,16 +29,9 @@ #ifndef __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -51,9 +44,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx index e3af82836356..eb4e09af7020 100644 --- a/framework/inc/uielement/objectmenucontroller.hxx +++ b/framework/inc/uielement/objectmenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -40,9 +33,6 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index 70f6478e49ce..8041138ad982 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -20,10 +20,6 @@ #ifndef _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ #define _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <helper/uielementwrapperbase.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -31,15 +27,9 @@ #include <macros/xtypeprovider.hxx> #include <macros/debug.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/awt/XWindow.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx index 620820dbc34a..b5150fd69a03 100644 --- a/framework/inc/uielement/recentfilesmenucontroller.hxx +++ b/framework/inc/uielement/recentfilesmenucontroller.hxx @@ -29,16 +29,9 @@ #ifndef __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -50,9 +43,6 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 0fd18a5c92c0..f5913a9ff120 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -29,19 +29,12 @@ #ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ #define __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <helper/shareablemutex.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -49,9 +42,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 2aa39017cd70..e13e175176f9 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -33,10 +33,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <uielement/complextoolbarcontroller.hxx> #include <vcl/toolbox.hxx> #include <vcl/spinfld.hxx> diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx index 42d2a7c7cf67..752079bc2373 100644 --- a/framework/inc/uielement/statusbar.hxx +++ b/framework/inc/uielement/statusbar.hxx @@ -20,20 +20,8 @@ #ifndef __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_ #define __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <uielement/statusbarmanager.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <vcl/status.hxx> namespace framework diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 247a42ec00f0..1ad8ed7cfba8 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -29,19 +29,12 @@ #ifndef __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_ #define __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XStatusbarController.hpp> @@ -51,9 +44,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index 376a81e31b67..7a06cc12837a 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -20,24 +20,13 @@ #ifndef __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_ #define __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <helper/uiconfigelementwrapperbase.hxx> #include <uielement/statusbarmanager.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index 0276ea162591..c19254a4ad5f 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -20,25 +20,15 @@ #ifndef __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_ #define __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 43c540abe1d6..0f1bf8703838 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -24,10 +24,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - #include <uielement/complextoolbarcontroller.hxx> #include <vcl/toolbox.hxx> #include <vcl/image.hxx> diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx index 980b59d8f58e..7d67f010c891 100644 --- a/framework/inc/uielement/toolbar.hxx +++ b/framework/inc/uielement/toolbar.hxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - - #ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX_ #define __FRAMEWORK_UIELEMENT_TOOLBAR_HXX_ diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 27a19c9489a3..8f36337fc0ac 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_ #define __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -40,9 +36,6 @@ #include <stdtypes.h> #include <uielement/commandinfo.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -63,9 +56,6 @@ #include <com/sun/star/frame/XToolbarController.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 67bca1e43d8c..52370f6cb681 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -20,16 +20,9 @@ #ifndef __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -43,9 +36,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index ee6b1dd7aee5..a777ca642b67 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -20,24 +20,13 @@ #ifndef __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_ #define __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <helper/uiconfigelementwrapperbase.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XUIFunctionListener.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index 65eb2b724bfd..8c5984ecc057 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -36,9 +36,6 @@ #include <list> #include <boost/unordered_map.hpp> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -46,17 +43,11 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index 8ab4da900e22..b462a5be6a2b 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -29,23 +29,11 @@ #ifndef __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_ #define __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <rtl/ustring.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx index c7e8214844a3..43097aa46119 100644 --- a/framework/inc/uifactory/addonstoolboxfactory.hxx +++ b/framework/inc/uifactory/addonstoolboxfactory.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -32,9 +28,6 @@ #include <macros/xserviceinfo.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -44,9 +37,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index b2e00e586b83..d055fd6ee87e 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -35,9 +35,6 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XContainerListener.hpp> @@ -45,9 +42,6 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 769b6c3beff6..135e6bad6c3f 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -31,9 +27,6 @@ #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -41,9 +34,6 @@ #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx index 6dd2d5ceece5..749bd5178b7a 100644 --- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx +++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx @@ -26,21 +26,10 @@ #include <vector> #include <list> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uifactory/toolbarcontrollerfactory.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx index 133197b84689..979639f61683 100644 --- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx @@ -20,22 +20,10 @@ #ifndef __FRAMEWORK_UIFACTORY_STATUSBARCONTROLLERFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_STATUSBARCONTROLLERFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <uifactory/toolbarcontrollerfactory.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - - namespace framework { diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx index 01f3fb92e592..c3233b2db2b3 100644 --- a/framework/inc/uifactory/statusbarfactory.hxx +++ b/framework/inc/uifactory/statusbarfactory.hxx @@ -20,21 +20,12 @@ #ifndef __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <macros/xserviceinfo.hxx> #include <services.h> #include <uifactory/menubarfactory.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> namespace framework diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx index 3a00dfb11c33..1e989a770441 100644 --- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx @@ -20,10 +20,6 @@ #ifndef __FRAMEWORK_UIFACTORY_TOOLBARCONTROLLERFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_TOOLBARCONTROLLERFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -31,17 +27,11 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx index f57ae82555fc..ea62fced95d5 100644 --- a/framework/inc/uifactory/toolboxfactory.hxx +++ b/framework/inc/uifactory/toolboxfactory.hxx @@ -20,20 +20,11 @@ #ifndef __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_ #define __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_ -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <stdtypes.h> #include <macros/xserviceinfo.hxx> #include <services.h> #include <uifactory/menubarfactory.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index 8c7d1a02f436..5a7c1f96a64a 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -35,9 +35,6 @@ #include <vector> #include <list> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -45,9 +42,6 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/XUIElementFactoryRegistration.hpp> @@ -55,9 +49,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include "com/sun/star/frame/XModuleManager.hpp" -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx index a3f2526d20d7..4711c1fa9120 100644 --- a/framework/inc/uifactory/windowcontentfactorymanager.hxx +++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx @@ -26,9 +26,6 @@ #include <vector> #include <list> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> @@ -36,16 +33,10 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include "com/sun/star/frame/XModuleManager.hpp" -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 5e0feabcfc07..0097878a379d 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -20,24 +20,16 @@ #ifndef _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #define _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ -//_______________________________________________ -// own includes - #include <accelerators/acceleratorcache.hxx> #include <accelerators/keymapping.hxx> #include <macros/xinterface.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> -//_______________________________________________ -// interface includes - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XLocator.hpp> -//_______________________________________________ -// other includes #include <salhelper/singletonref.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index 096aed94d25d..fe40f9aa3c2d 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -20,21 +20,13 @@ #ifndef _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_ #define _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_ -//_______________________________________________ -// own includes - #include <accelerators/acceleratorcache.hxx> #include <accelerators/keymapping.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> -//_______________________________________________ -// interface includes - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -//_______________________________________________ -// other includes #include <salhelper/singletonref.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index fc9ebbc7e861..524c0978d343 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -31,15 +31,8 @@ #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <xml/imagesconfiguration.hxx> #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index c6b67657749a..0bee38d96e22 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -29,10 +29,6 @@ #ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_ -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -40,9 +36,6 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/XComponentContext.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 487c07748c07..08e340f2b6d2 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -31,15 +31,8 @@ #include <framework/statusbarconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 1b83e7481111..a8556bb62653 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -31,15 +31,9 @@ #include <framework/toolboxconfiguration.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> |