summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UnoControls/inc/basecontainercontrol.hxx7
-rw-r--r--UnoControls/inc/basecontrol.hxx7
-rw-r--r--UnoControls/inc/multiplexer.hxx7
-rw-r--r--UnoControls/source/base/basecontainercontrol.cxx11
-rw-r--r--UnoControls/source/base/basecontrol.cxx11
-rw-r--r--UnoControls/source/base/registercontrols.cxx8
-rw-r--r--UnoControls/source/controls/OConnectionPointContainerHelper.cxx11
-rw-r--r--UnoControls/source/controls/OConnectionPointHelper.cxx11
-rw-r--r--UnoControls/source/controls/framecontrol.cxx12
-rw-r--r--UnoControls/source/controls/progressbar.cxx10
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx11
-rw-r--r--UnoControls/source/controls/statusindicator.cxx10
-rw-r--r--UnoControls/source/inc/OConnectionPointContainerHelper.hxx8
-rw-r--r--UnoControls/source/inc/OConnectionPointHelper.hxx7
-rw-r--r--UnoControls/source/inc/framecontrol.hxx7
-rw-r--r--UnoControls/source/inc/progressbar.hxx7
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx7
-rw-r--r--UnoControls/source/inc/statusindicator.hxx7
-rw-r--r--accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx5
-rw-r--r--avmedia/source/framework/soundhandler.cxx10
-rw-r--r--avmedia/source/framework/soundhandler.hxx7
-rw-r--r--canvas/source/directx/dx_9rm.cxx4
-rw-r--r--comphelper/inc/comphelper/configurationhelper.hxx3
-rw-r--r--comphelper/inc/comphelper/locale.hxx3
-rw-r--r--comphelper/inc/comphelper/mediadescriptor.hxx3
-rw-r--r--comphelper/inc/comphelper/numberedcollection.hxx3
-rw-r--r--comphelper/inc/comphelper/sequenceashashmap.hxx3
-rw-r--r--comphelper/inc/comphelper/sequenceasvector.hxx3
-rw-r--r--comphelper/inc/comphelper/stillreadwriteinteraction.hxx2
-rw-r--r--comphelper/source/misc/configurationhelper.cxx3
-rw-r--r--comphelper/source/misc/locale.cxx2
-rw-r--r--comphelper/source/misc/numberedcollection.cxx3
-rw-r--r--comphelper/source/misc/sequenceashashmap.cxx3
-rw-r--r--cui/source/customize/acccfg.src2
-rw-r--r--cui/source/customize/eventdlg.cxx1
-rw-r--r--cui/source/dialogs/about.cxx2
-rw-r--r--cui/source/dialogs/charmap.src2
-rw-r--r--cui/source/dialogs/commonlingui.src2
-rw-r--r--cui/source/dialogs/dlgname.src2
-rw-r--r--cui/source/dialogs/hyphen.src2
-rw-r--r--cui/source/dialogs/postdlg.src2
-rw-r--r--cui/source/dialogs/srchxtra.src2
-rw-r--r--cui/source/dialogs/zoom.src2
-rw-r--r--cui/source/factory/dlgfact.hxx1
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/about.hxx2
-rw-r--r--cui/source/inc/align.hxx2
-rw-r--r--cui/source/inc/backgrnd.hxx2
-rw-r--r--cui/source/inc/bbdlg.hxx2
-rw-r--r--cui/source/inc/border.hxx3
-rw-r--r--cui/source/inc/chardlg.hxx2
-rw-r--r--cui/source/inc/connect.hxx2
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/cuihyperdlg.hxx2
-rw-r--r--cui/source/inc/cuioptgenrl.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx2
-rw-r--r--cui/source/inc/cuitabline.hxx1
-rw-r--r--cui/source/inc/dialmgr.hxx2
-rw-r--r--cui/source/inc/helpid.hrc1
-rw-r--r--cui/source/inc/hyphen.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx3
-rw-r--r--cui/source/inc/measure.hxx2
-rw-r--r--cui/source/inc/multifil.hxx2
-rw-r--r--cui/source/inc/multipat.hxx2
-rw-r--r--cui/source/inc/numpages.hxx2
-rw-r--r--cui/source/inc/optdict.hxx2
-rw-r--r--cui/source/inc/optlingu.hxx2
-rw-r--r--cui/source/inc/optpath.hxx2
-rw-r--r--cui/source/inc/paragrph.hxx2
-rw-r--r--cui/source/inc/postdlg.hxx2
-rw-r--r--cui/source/inc/radiobtnbox.hxx2
-rw-r--r--cui/source/inc/srchxtra.hxx2
-rw-r--r--cui/source/inc/tabstpge.hxx2
-rw-r--r--cui/source/inc/textanim.hxx2
-rw-r--r--cui/source/inc/textattr.hxx2
-rw-r--r--cui/source/inc/transfrm.hxx2
-rw-r--r--cui/source/inc/zoom.hxx2
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optgdlg.src1
-rw-r--r--cui/source/options/optgenrl.src2
-rw-r--r--cui/source/options/opthtml.src1
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjava.src2
-rw-r--r--cui/source/options/optlingu.src2
-rw-r--r--cui/source/options/optmemory.src2
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optsave.src1
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/optupdt.src1
-rw-r--r--cui/source/options/securityoptions.src2
-rw-r--r--cui/source/options/webconninfo.src2
-rw-r--r--cui/source/tabpages/align.src2
-rw-r--r--cui/source/tabpages/bbdlg.src2
-rw-r--r--cui/source/tabpages/border.src2
-rw-r--r--cui/source/tabpages/chardlg.src2
-rw-r--r--cui/source/tabpages/dstribut.src1
-rw-r--r--cui/source/tabpages/labdlg.src2
-rw-r--r--cui/source/tabpages/numfmt.src2
-rw-r--r--cui/source/tabpages/page.src2
-rw-r--r--cui/source/tabpages/paragrph.src2
-rw-r--r--cui/source/tabpages/strings.src2
-rw-r--r--cui/source/tabpages/swpossizetabpage.src2
-rw-r--r--cui/source/tabpages/tabarea.src2
-rw-r--r--cui/source/tabpages/tabline.src2
-rw-r--r--cui/source/tabpages/tabstpge.src2
-rw-r--r--cui/source/tabpages/textattr.src2
-rw-r--r--cui/source/tabpages/transfrm.src2
-rw-r--r--dtrans/source/cnttype/mcnttfactory.cxx3
-rw-r--r--dtrans/source/cnttype/mcnttfactory.hxx4
-rw-r--r--dtrans/source/cnttype/mcnttype.cxx3
-rw-r--r--dtrans/source/cnttype/mcnttype.hxx4
-rw-r--r--dtrans/source/cnttype/mctfentry.cxx3
-rw-r--r--dtrans/source/cnttype/wbench/testcnttype.cxx3
-rw-r--r--dtrans/source/inc/DtObjFactory.hxx4
-rw-r--r--dtrans/source/test/test_dtrans.cxx8
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.cxx3
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx4
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.cxx3
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.hxx5
-rw-r--r--dtrans/source/win32/clipb/wcbentry.cxx3
-rw-r--r--dtrans/source/win32/dtobj/APNDataObject.cxx3
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx3
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.cxx3
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.cxx3
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DtObjFactory.cxx3
-rw-r--r--dtrans/source/win32/dtobj/Fetc.cxx3
-rw-r--r--dtrans/source/win32/dtobj/Fetc.hxx4
-rw-r--r--dtrans/source/win32/dtobj/FetcList.cxx3
-rw-r--r--dtrans/source/win32/dtobj/FetcList.hxx4
-rw-r--r--dtrans/source/win32/dtobj/MimeAttrib.hxx4
-rw-r--r--dtrans/source/win32/dtobj/TxtCnvtHlp.cxx3
-rw-r--r--dtrans/source/win32/dtobj/XNotifyingDataObject.hxx5
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx3
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.hxx5
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx3
-rw-r--r--dtrans/source/win32/ftransl/ftransl.hxx4
-rw-r--r--dtrans/source/win32/ftransl/ftranslentry.cxx3
-rw-r--r--dtrans/source/win32/misc/ImplHelper.cxx3
-rw-r--r--dtrans/source/win32/misc/ImplHelper.hxx4
-rw-r--r--dtrans/source/win32/misc/WinClip.hxx5
-rw-r--r--dtrans/source/win32/workbench/XTDo.cxx3
-rw-r--r--dtrans/source/win32/workbench/XTDo.hxx5
-rw-r--r--dtrans/source/win32/workbench/test_wincb.cxx7
-rw-r--r--dtrans/source/win32/workbench/testmarshal.cxx7
-rw-r--r--editeng/inc/editeng/acorrcfg.hxx2
-rw-r--r--editeng/inc/editeng/adjitem.hxx2
-rw-r--r--editeng/inc/editeng/akrnitem.hxx2
-rw-r--r--editeng/inc/editeng/blnkitem.hxx2
-rw-r--r--editeng/inc/editeng/bolnitem.hxx4
-rw-r--r--editeng/inc/editeng/brkitem.hxx2
-rw-r--r--editeng/inc/editeng/brshitem.hxx2
-rw-r--r--editeng/inc/editeng/bulitem.hxx2
-rw-r--r--editeng/inc/editeng/charhiddenitem.hxx2
-rw-r--r--editeng/inc/editeng/charreliefitem.hxx2
-rw-r--r--editeng/inc/editeng/charrotateitem.hxx2
-rw-r--r--editeng/inc/editeng/charscaleitem.hxx2
-rw-r--r--editeng/inc/editeng/cmapitem.hxx2
-rw-r--r--editeng/inc/editeng/cntritem.hxx2
-rw-r--r--editeng/inc/editeng/colritem.hxx2
-rw-r--r--editeng/inc/editeng/crsditem.hxx2
-rw-r--r--editeng/inc/editeng/cscoitem.hxx2
-rw-r--r--editeng/inc/editeng/editids.hrc2
-rw-r--r--editeng/inc/editeng/editrids.hrc2
-rw-r--r--editeng/inc/editeng/edtdlg.hxx2
-rw-r--r--editeng/inc/editeng/emphitem.hxx2
-rw-r--r--editeng/inc/editeng/escpitem.hxx2
-rw-r--r--editeng/inc/editeng/fhgtitem.hxx2
-rw-r--r--editeng/inc/editeng/flstitem.hxx2
-rw-r--r--editeng/inc/editeng/fontitem.hxx2
-rw-r--r--editeng/inc/editeng/forbiddenruleitem.hxx2
-rw-r--r--editeng/inc/editeng/frmdiritem.hxx2
-rw-r--r--editeng/inc/editeng/fwdtitem.hxx3
-rw-r--r--editeng/inc/editeng/hngpnctitem.hxx2
-rw-r--r--editeng/inc/editeng/hyznitem.hxx2
-rw-r--r--editeng/inc/editeng/itemtype.hxx2
-rw-r--r--editeng/inc/editeng/keepitem.hxx2
-rw-r--r--editeng/inc/editeng/kernitem.hxx2
-rw-r--r--editeng/inc/editeng/langitem.hxx2
-rw-r--r--editeng/inc/editeng/lcolitem.hxx2
-rw-r--r--editeng/inc/editeng/lrspitem.hxx2
-rw-r--r--editeng/inc/editeng/lspcitem.hxx2
-rw-r--r--editeng/inc/editeng/nhypitem.hxx2
-rw-r--r--editeng/inc/editeng/nlbkitem.hxx3
-rw-r--r--editeng/inc/editeng/numitem.hxx2
-rw-r--r--editeng/inc/editeng/opaqitem.hxx2
-rw-r--r--editeng/inc/editeng/optitems.hxx2
-rw-r--r--editeng/inc/editeng/orphitem.hxx2
-rw-r--r--editeng/inc/editeng/paravertalignitem.hxx2
-rw-r--r--editeng/inc/editeng/pbinitem.hxx2
-rw-r--r--editeng/inc/editeng/pgrditem.hxx2
-rw-r--r--editeng/inc/editeng/pmdlitem.hxx2
-rw-r--r--editeng/inc/editeng/postitem.hxx2
-rw-r--r--editeng/inc/editeng/prntitem.hxx2
-rw-r--r--editeng/inc/editeng/protitem.hxx3
-rw-r--r--editeng/inc/editeng/prszitem.hxx2
-rw-r--r--editeng/inc/editeng/scriptspaceitem.hxx2
-rw-r--r--editeng/inc/editeng/scripttypeitem.hxx2
-rw-r--r--editeng/inc/editeng/shaditem.hxx2
-rw-r--r--editeng/inc/editeng/shdditem.hxx2
-rw-r--r--editeng/inc/editeng/sizeitem.hxx2
-rw-r--r--editeng/inc/editeng/spltitem.hxx2
-rw-r--r--editeng/inc/editeng/splwrap.hxx2
-rw-r--r--editeng/inc/editeng/tstpitem.hxx2
-rw-r--r--editeng/inc/editeng/udlnitem.hxx2
-rw-r--r--editeng/inc/editeng/ulspitem.hxx2
-rw-r--r--editeng/inc/editeng/wghtitem.hxx2
-rw-r--r--editeng/inc/editeng/widwitem.hxx2
-rw-r--r--editeng/inc/editeng/writingmodeitem.hxx2
-rw-r--r--editeng/inc/editeng/wrlmitem.hxx2
-rw-r--r--editeng/source/items/page.src2
-rw-r--r--filter/inc/filter.hrc2
-rw-r--r--filter/source/config/cache/basecontainer.cxx2
-rw-r--r--filter/source/config/cache/basecontainer.hxx3
-rw-r--r--filter/source/config/cache/cacheitem.cxx2
-rw-r--r--filter/source/config/cache/cacheitem.hxx3
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx2
-rw-r--r--filter/source/config/cache/cacheupdatelistener.hxx3
-rw-r--r--filter/source/config/cache/configflush.cxx2
-rw-r--r--filter/source/config/cache/configflush.hxx3
-rw-r--r--filter/source/config/cache/contenthandlerfactory.cxx2
-rw-r--r--filter/source/config/cache/contenthandlerfactory.hxx3
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--filter/source/config/cache/filtercache.hxx3
-rw-r--r--filter/source/config/cache/filterfactory.cxx2
-rw-r--r--filter/source/config/cache/filterfactory.hxx3
-rw-r--r--filter/source/config/cache/frameloaderfactory.cxx2
-rw-r--r--filter/source/config/cache/frameloaderfactory.hxx3
-rw-r--r--filter/source/config/cache/lateinitlistener.hxx3
-rw-r--r--filter/source/config/cache/querytokenizer.cxx4
-rw-r--r--filter/source/config/cache/querytokenizer.hxx3
-rw-r--r--filter/source/config/cache/typedetection.cxx2
-rw-r--r--filter/source/config/cache/typedetection.hxx3
-rw-r--r--forms/source/xforms/binding.hxx2
-rw-r--r--forms/source/xforms/boolexpression.hxx1
-rw-r--r--forms/source/xforms/computedexpression.hxx2
-rw-r--r--forms/source/xforms/model.hxx4
-rw-r--r--forms/source/xforms/pathexpression.hxx3
-rw-r--r--forms/source/xforms/propertysetbase.hxx2
-rw-r--r--forms/source/xforms/submission.hxx3
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.hxx4
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.mm4
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.hxx4
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.mm4
-rw-r--r--fpicker/source/aqua/SalAquaPicker.hxx4
-rw-r--r--fpicker/source/aqua/SalAquaPicker.mm4
-rw-r--r--fpicker/source/aqua/resourceprovider.hxx4
-rw-r--r--fpicker/source/aqua/resourceprovider.mm4
-rw-r--r--fpicker/source/office/iodlg.src1
-rw-r--r--fpicker/source/win32/filepicker/FPentry.cxx4
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.cxx5
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.hxx4
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx5
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.hxx5
-rw-r--r--fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx4
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.cxx5
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx5
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx5
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx4
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.hxx4
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlaccess.cxx5
-rw-r--r--fpicker/source/win32/filepicker/controlaccess.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.cxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommandrequest.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommandresult.hxx4
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx5
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.hxx4
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.cxx4
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.hxx4
-rw-r--r--fpicker/source/win32/filepicker/getfilenamewrapper.cxx5
-rw-r--r--fpicker/source/win32/filepicker/getfilenamewrapper.hxx4
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.cxx5
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.hxx4
-rw-r--r--fpicker/source/win32/filepicker/vistatypes.h4
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx8
-rw-r--r--fpicker/source/win32/folderpicker/FOPServiceInfo.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx5
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.hxx5
-rw-r--r--fpicker/source/win32/folderpicker/workbench/Test_fops.cxx8
-rw-r--r--fpicker/source/win32/misc/AutoBuffer.cxx4
-rw-r--r--fpicker/source/win32/misc/AutoBuffer.hxx4
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx4
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.hxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.hxx4
-rw-r--r--fpicker/test/svdem.cxx8
-rw-r--r--framework/inc/acceleratorconst.h8
-rw-r--r--framework/inc/classes/checkediterator.hxx11
-rw-r--r--framework/inc/classes/converter.hxx11
-rw-r--r--framework/inc/classes/droptargetlistener.hxx11
-rw-r--r--framework/inc/classes/filtercache.hxx10
-rw-r--r--framework/inc/classes/filtercachedata.hxx9
-rw-r--r--framework/inc/classes/framecontainer.hxx9
-rw-r--r--framework/inc/classes/menumanager.hxx6
-rw-r--r--framework/inc/classes/propertysethelper.hxx8
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx11
-rw-r--r--framework/inc/classes/taskcreator.hxx10
-rw-r--r--framework/inc/classes/wildcard.hxx11
-rw-r--r--framework/inc/dispatch/closedispatcher.hxx7
-rw-r--r--framework/inc/dispatch/dispatchinformationprovider.hxx10
-rw-r--r--framework/inc/dispatch/interceptionhelper.hxx10
-rw-r--r--framework/inc/dispatch/mailtodispatcher.hxx10
-rw-r--r--framework/inc/dispatch/menudispatcher.hxx10
-rw-r--r--framework/inc/dispatch/oxt_handler.hxx9
-rw-r--r--framework/inc/dispatch/popupmenudispatcher.hxx10
-rw-r--r--framework/inc/dispatch/servicehandler.hxx10
-rw-r--r--framework/inc/dispatch/startmoduledispatcher.hxx7
-rw-r--r--framework/inc/dispatch/systemexec.hxx10
-rw-r--r--framework/inc/dispatchcommands.h4
-rw-r--r--framework/inc/framework/addonmenu.hxx8
-rw-r--r--framework/inc/framework/addonsoptions.hxx4
-rw-r--r--framework/inc/framework/bmkmenu.hxx6
-rw-r--r--framework/inc/framework/framelistanalyzer.hxx4
-rw-r--r--framework/inc/framework/iguard.hxx4
-rw-r--r--framework/inc/framework/imageproducer.hxx3
-rw-r--r--framework/inc/framework/imutex.hxx4
-rw-r--r--framework/inc/framework/interaction.hxx3
-rw-r--r--framework/inc/framework/menuconfiguration.hxx8
-rw-r--r--framework/inc/framework/preventduplicateinteraction.hxx9
-rw-r--r--framework/inc/framework/titlehelper.hxx3
-rw-r--r--framework/inc/general.h3
-rw-r--r--framework/inc/helper/dockingareadefaultacceptor.hxx10
-rw-r--r--framework/inc/helper/ocomponentaccess.hxx10
-rw-r--r--framework/inc/helper/ocomponentenumeration.hxx10
-rw-r--r--framework/inc/helper/oframes.hxx10
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx10
-rw-r--r--framework/inc/helper/tagwindowasmodified.hxx10
-rw-r--r--framework/inc/helper/titlebarupdate.hxx12
-rw-r--r--framework/inc/helper/uiconfigelementwrapperbase.hxx10
-rw-r--r--framework/inc/helper/uielementwrapperbase.hxx10
-rw-r--r--framework/inc/helper/vclstatusindicator.hxx7
-rw-r--r--framework/inc/interaction/quietinteraction.hxx10
-rw-r--r--framework/inc/jobs/configaccess.hxx7
-rw-r--r--framework/inc/jobs/helponstartup.hxx7
-rw-r--r--framework/inc/jobs/job.hxx7
-rw-r--r--framework/inc/jobs/jobconst.hxx8
-rw-r--r--framework/inc/jobs/jobdata.hxx7
-rw-r--r--framework/inc/jobs/jobdispatch.hxx7
-rw-r--r--framework/inc/jobs/jobexecutor.hxx7
-rw-r--r--framework/inc/jobs/jobresult.hxx7
-rw-r--r--framework/inc/jobs/joburl.hxx8
-rw-r--r--framework/inc/jobs/shelljob.hxx7
-rw-r--r--framework/inc/macros/debug/assertion.hxx4
-rw-r--r--framework/inc/macros/debug/event.hxx4
-rw-r--r--framework/inc/macros/debug/filterdbg.hxx4
-rw-r--r--framework/inc/macros/debug/logmechanism.hxx4
-rw-r--r--framework/inc/macros/debug/mutex.hxx4
-rw-r--r--framework/inc/macros/debug/plugin.hxx4
-rw-r--r--framework/inc/macros/debug/registration.hxx4
-rw-r--r--framework/inc/macros/debug/targeting.hxx4
-rw-r--r--framework/inc/macros/generic.hxx4
-rw-r--r--framework/inc/macros/registration.hxx11
-rw-r--r--framework/inc/macros/xinterface.hxx11
-rw-r--r--framework/inc/macros/xserviceinfo.hxx10
-rw-r--r--framework/inc/macros/xtypeprovider.hxx11
-rw-r--r--framework/inc/properties.h3
-rw-r--r--framework/inc/queries.h7
-rw-r--r--framework/inc/recording/dispatchrecorder.hxx1
-rw-r--r--framework/inc/services.h4
-rw-r--r--framework/inc/services/autorecovery.hxx7
-rw-r--r--framework/inc/services/backingcomp.hxx7
-rw-r--r--framework/inc/services/contenthandlerfactory.hxx10
-rw-r--r--framework/inc/services/desktop.hxx11
-rw-r--r--framework/inc/services/dispatchhelper.hxx7
-rw-r--r--framework/inc/services/frame.hxx10
-rw-r--r--framework/inc/services/layoutmanager.hxx9
-rw-r--r--framework/inc/services/license.hxx9
-rw-r--r--framework/inc/services/logindialog.hxx10
-rw-r--r--framework/inc/services/mediatypedetectionhelper.hxx10
-rw-r--r--framework/inc/services/modulemanager.hxx7
-rw-r--r--framework/inc/services/pathsettings.hxx10
-rw-r--r--framework/inc/services/sessionlistener.hxx7
-rw-r--r--framework/inc/services/substitutepathvars.hxx9
-rw-r--r--framework/inc/services/tabwindowservice.hxx12
-rw-r--r--framework/inc/services/taskcreatorsrv.hxx7
-rw-r--r--framework/inc/services/urltransformer.hxx10
-rw-r--r--framework/inc/stdtypes.h10
-rw-r--r--framework/inc/tabwin/tabwindow.hxx10
-rw-r--r--framework/inc/tabwin/tabwinfactory.hxx10
-rw-r--r--framework/inc/threadhelp/fairrwlock.hxx10
-rw-r--r--framework/inc/threadhelp/gate.hxx11
-rw-r--r--framework/inc/threadhelp/igate.h4
-rw-r--r--framework/inc/threadhelp/inoncopyable.h12
-rw-r--r--framework/inc/threadhelp/irwlock.h4
-rw-r--r--framework/inc/threadhelp/itransactionmanager.h4
-rw-r--r--framework/inc/threadhelp/lockhelper.hxx11
-rw-r--r--framework/inc/threadhelp/threadhelpbase.hxx12
-rw-r--r--framework/inc/threadhelp/transactionbase.hxx12
-rw-r--r--framework/inc/threadhelp/transactionguard.hxx12
-rw-r--r--framework/inc/threadhelp/transactionmanager.hxx10
-rw-r--r--framework/inc/uiconfiguration/globalsettings.hxx9
-rw-r--r--framework/inc/uiconfiguration/graphicnameaccess.hxx3
-rw-r--r--framework/inc/uiconfiguration/imagemanager.hxx9
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx9
-rw-r--r--framework/inc/uiconfiguration/moduleuicfgsupplier.hxx9
-rw-r--r--framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx9
-rw-r--r--framework/inc/uiconfiguration/uicategorydescription.hxx10
-rw-r--r--framework/inc/uiconfiguration/uiconfigurationmanager.hxx9
-rw-r--r--framework/inc/uiconfiguration/windowstateconfiguration.hxx9
-rw-r--r--framework/inc/uielement/addonstoolbarmanager.hxx10
-rw-r--r--framework/inc/uielement/addonstoolbarwrapper.hxx11
-rw-r--r--framework/inc/uielement/buttontoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/commandinfo.hxx8
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx3
-rw-r--r--framework/inc/uielement/constitemcontainer.hxx10
-rw-r--r--framework/inc/uielement/controlmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/dropdownboxtoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/edittoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/fontmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/fontsizemenucontroller.hxx10
-rw-r--r--framework/inc/uielement/footermenucontroller.hxx3
-rw-r--r--framework/inc/uielement/generictoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/headermenucontroller.hxx10
-rw-r--r--framework/inc/uielement/imagebuttontoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/itemcontainer.hxx10
-rw-r--r--framework/inc/uielement/langselectionmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/menubarmanager.hxx9
-rw-r--r--framework/inc/uielement/menubarwrapper.hxx11
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/objectmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/progressbarwrapper.hxx10
-rw-r--r--framework/inc/uielement/recentfilesmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/rootitemcontainer.hxx10
-rw-r--r--framework/inc/uielement/spinfieldtoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/statusbar.hxx12
-rw-r--r--framework/inc/uielement/statusbarmanager.hxx10
-rw-r--r--framework/inc/uielement/statusbarwrapper.hxx11
-rw-r--r--framework/inc/uielement/statusindicatorinterfacewrapper.hxx10
-rw-r--r--framework/inc/uielement/togglebuttontoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/toolbar.hxx5
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx10
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx10
-rw-r--r--framework/inc/uielement/toolbarwrapper.hxx11
-rw-r--r--framework/inc/uielement/uicommanddescription.hxx9
-rw-r--r--framework/inc/uielement/uielement.hxx12
-rw-r--r--framework/inc/uifactory/addonstoolboxfactory.hxx10
-rw-r--r--framework/inc/uifactory/factoryconfiguration.hxx6
-rw-r--r--framework/inc/uifactory/menubarfactory.hxx10
-rw-r--r--framework/inc/uifactory/popupmenucontrollerfactory.hxx11
-rw-r--r--framework/inc/uifactory/statusbarcontrollerfactory.hxx12
-rw-r--r--framework/inc/uifactory/statusbarfactory.hxx9
-rw-r--r--framework/inc/uifactory/toolbarcontrollerfactory.hxx10
-rw-r--r--framework/inc/uifactory/toolboxfactory.hxx9
-rw-r--r--framework/inc/uifactory/uielementfactorymanager.hxx9
-rw-r--r--framework/inc/uifactory/windowcontentfactorymanager.hxx9
-rw-r--r--framework/inc/xml/acceleratorconfigurationreader.hxx8
-rw-r--r--framework/inc/xml/acceleratorconfigurationwriter.hxx8
-rw-r--r--framework/inc/xml/imagesdocumenthandler.hxx7
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx7
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx7
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx6
-rw-r--r--framework/source/accelerators/acceleratorcache.cxx8
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx6
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx8
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx6
-rw-r--r--framework/source/accelerators/keymapping.cxx9
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx7
-rw-r--r--framework/source/accelerators/presethandler.cxx7
-rw-r--r--framework/source/accelerators/storageholder.cxx7
-rw-r--r--framework/source/classes/droptargetlistener.cxx10
-rw-r--r--framework/source/classes/framecontainer.cxx12
-rw-r--r--framework/source/classes/menumanager.cxx11
-rw-r--r--framework/source/classes/taskcreator.cxx14
-rw-r--r--framework/source/dispatch/closedispatcher.cxx8
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx10
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx8
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx11
-rw-r--r--framework/source/dispatch/menudispatcher.cxx11
-rw-r--r--framework/source/dispatch/oxt_handler.cxx12
-rw-r--r--framework/source/dispatch/popupmenudispatcher.cxx12
-rw-r--r--framework/source/dispatch/servicehandler.cxx11
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx7
-rw-r--r--framework/source/dispatch/systemexec.cxx11
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx10
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx10
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx4
-rw-r--r--framework/source/fwe/classes/bmkmenu.cxx11
-rw-r--r--framework/source/fwe/classes/framelistanalyzer.cxx6
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx4
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx4
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx11
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx7
-rw-r--r--framework/source/fwe/xml/statusbarconfiguration.cxx7
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx11
-rw-r--r--framework/source/fwe/xml/toolboxconfiguration.cxx7
-rw-r--r--framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx11
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx9
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx11
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx7
-rw-r--r--framework/source/fwi/jobs/jobconst.cxx11
-rw-r--r--framework/source/fwi/threadhelp/lockhelper.cxx11
-rw-r--r--framework/source/fwi/threadhelp/transactionmanager.cxx10
-rw-r--r--framework/source/fwi/uielement/itemcontainer.cxx7
-rw-r--r--framework/source/fwi/uielement/rootitemcontainer.cxx4
-rw-r--r--framework/source/helper/dockingareadefaultacceptor.cxx11
-rw-r--r--framework/source/helper/ocomponentaccess.cxx10
-rw-r--r--framework/source/helper/ocomponentenumeration.cxx11
-rw-r--r--framework/source/helper/oframes.cxx10
-rw-r--r--framework/source/helper/persistentwindowstate.cxx10
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx8
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx11
-rw-r--r--framework/source/helper/titlebarupdate.cxx5
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx10
-rw-r--r--framework/source/helper/uielementwrapperbase.cxx10
-rw-r--r--framework/source/helper/vclstatusindicator.cxx8
-rw-r--r--framework/source/inc/accelerators/acceleratorcache.hxx8
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx8
-rw-r--r--framework/source/inc/accelerators/documentacceleratorconfiguration.hxx9
-rw-r--r--framework/source/inc/accelerators/globalacceleratorconfiguration.hxx10
-rw-r--r--framework/source/inc/accelerators/istoragelistener.hxx8
-rw-r--r--framework/source/inc/accelerators/keymapping.hxx9
-rw-r--r--framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx9
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx8
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx11
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx8
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx9
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx7
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx6
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx7
-rw-r--r--framework/source/inc/loadenv/targethelper.hxx3
-rw-r--r--framework/source/inc/pattern/configuration.hxx7
-rw-r--r--framework/source/inc/pattern/frame.hxx9
-rw-r--r--framework/source/inc/pattern/window.hxx8
-rw-r--r--framework/source/interaction/quietinteraction.cxx9
-rw-r--r--framework/source/jobs/job.cxx7
-rw-r--r--framework/source/jobs/jobdata.cxx7
-rw-r--r--framework/source/jobs/jobdispatch.cxx7
-rw-r--r--framework/source/jobs/jobexecutor.cxx7
-rw-r--r--framework/source/jobs/jobresult.cxx9
-rw-r--r--framework/source/jobs/joburl.cxx8
-rw-r--r--framework/source/layoutmanager/helpers.cxx4
-rw-r--r--framework/source/layoutmanager/helpers.hxx3
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx3
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx4
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx10
-rw-r--r--framework/source/layoutmanager/uielement.cxx9
-rw-r--r--framework/source/loadenv/loadenv.cxx6
-rw-r--r--framework/source/register/register3rdcomponents.cxx3
-rw-r--r--framework/source/register/registerlogindialog.cxx4
-rw-r--r--framework/source/register/registertemp.cxx3
-rw-r--r--framework/source/services/autorecovery.cxx6
-rw-r--r--framework/source/services/backingcomp.cxx6
-rw-r--r--framework/source/services/dispatchhelper.cxx7
-rw-r--r--framework/source/services/license.cxx13
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx8
-rw-r--r--framework/source/services/pathsettings.cxx7
-rw-r--r--framework/source/services/sessionlistener.cxx9
-rw-r--r--framework/source/services/substitutepathvars.cxx10
-rw-r--r--framework/source/services/tabwindowservice.cxx13
-rw-r--r--framework/source/services/taskcreatorsrv.cxx6
-rw-r--r--framework/source/services/urltransformer.cxx11
-rw-r--r--framework/source/tabwin/tabwindow.cxx10
-rw-r--r--framework/source/tabwin/tabwinfactory.cxx9
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx10
-rw-r--r--framework/source/uiconfiguration/graphicnameaccess.cxx8
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx7
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx7
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx9
-rw-r--r--framework/source/uiconfiguration/moduleimagemanager.cxx7
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx6
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx7
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx11
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx7
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx10
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx11
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx13
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx11
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx10
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx11
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx10
-rw-r--r--framework/source/uielement/footermenucontroller.cxx10
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/headermenucontroller.cxx10
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx10
-rw-r--r--framework/source/uielement/menubarmanager.cxx11
-rw-r--r--framework/source/uielement/menubarwrapper.cxx10
-rw-r--r--framework/source/uielement/newmenucontroller.cxx9
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx10
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx9
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx9
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/statusbar.cxx8
-rw-r--r--framework/source/uielement/statusbarmanager.cxx10
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx9
-rw-r--r--framework/source/uielement/statusindicatorinterfacewrapper.cxx8
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/toolbar.cxx4
-rw-r--r--framework/source/uielement/toolbarmanager.cxx11
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx10
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx12
-rw-r--r--framework/source/uielement/uicommanddescription.cxx10
-rw-r--r--framework/source/uifactory/addonstoolboxfactory.cxx9
-rw-r--r--framework/source/uifactory/factoryconfiguration.cxx10
-rw-r--r--framework/source/uifactory/menubarfactory.cxx10
-rw-r--r--framework/source/uifactory/popupmenucontrollerfactory.cxx10
-rw-r--r--framework/source/uifactory/statusbarcontrollerfactory.cxx10
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx9
-rw-r--r--framework/source/uifactory/toolbarcontrollerfactory.cxx10
-rw-r--r--framework/source/uifactory/toolboxfactory.cxx9
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx10
-rw-r--r--framework/source/uifactory/windowcontentfactorymanager.cxx10
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx7
-rw-r--r--framework/source/xml/acceleratorconfigurationwriter.cxx6
-rw-r--r--framework/source/xml/imagesconfiguration.cxx7
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx11
-rw-r--r--l10ntools/inc/helpmerge.hxx2
-rw-r--r--l10ntools/source/helpmerge.cxx2
-rw-r--r--sal/qa/osl/process/osl_process_child.cxx2
-rw-r--r--sal/workben/clipboardwben/testcopy/XTDataObject.cxx4
-rw-r--r--sal/workben/clipboardwben/testcopy/XTDataObject.hxx5
-rw-r--r--salhelper/inc/salhelper/singletonref.hxx3
-rw-r--r--sc/inc/scabstdlg.hxx2
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx1
-rw-r--r--sd/inc/sdabstdlg.hxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx1
-rw-r--r--sfx2/inc/inettbc.hxx1
-rw-r--r--sfx2/inc/sfx2/dialogs.hrc2
-rw-r--r--sfx2/inc/sfx2/dinfedt.hxx2
-rw-r--r--sfx2/inc/sfx2/navigat.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc2
-rw-r--r--sfx2/source/appl/app.src2
-rw-r--r--sfx2/source/bastyp/fltfnc.src1
-rw-r--r--sfx2/source/bastyp/fltlst.cxx3
-rw-r--r--sfx2/source/bastyp/fltlst.hxx3
-rw-r--r--sfx2/source/dialog/dialog.src1
-rw-r--r--sfx2/source/dialog/dinfdlg.src2
-rw-r--r--sfx2/source/dialog/navigat.cxx3
-rw-r--r--sfx2/source/dialog/partwnd.cxx2
-rw-r--r--sfx2/source/dialog/passwd.src1
-rw-r--r--sfx2/source/dialog/printopt.src2
-rw-r--r--sfx2/source/dialog/recfloat.cxx2
-rw-r--r--sfx2/source/dialog/recfloat.src2
-rw-r--r--sfx2/source/dialog/templdlg.src2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx13
-rw-r--r--sfx2/source/inc/helper.hxx2
-rw-r--r--sfx2/source/inc/helpid.hrc2
-rw-r--r--sfx2/source/inc/recfloat.hxx2
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx8
-rw-r--r--sfx2/source/view/view.src2
-rw-r--r--shell/source/cmdmail/cmdmailentry.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailmsg.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.hxx4
-rw-r--r--shell/source/unix/exec/shellexecentry.cxx4
-rw-r--r--shell/source/win32/SysShExec.cxx4
-rw-r--r--shell/source/win32/SysShExec.hxx4
-rw-r--r--shell/source/win32/SysShentry.cxx4
-rw-r--r--shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx3
-rw-r--r--shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx4
-rw-r--r--shell/source/win32/simplemail/smplmailentry.cxx4
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.cxx4
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.hxx4
-rw-r--r--shell/source/win32/workbench/TestProxySet.cxx5
-rw-r--r--shell/source/win32/workbench/TestSmplMail.cxx5
-rw-r--r--shell/source/win32/workbench/TestSysShExec.cxx8
-rw-r--r--svl/source/config/itemholder2.cxx2
-rw-r--r--svl/source/config/itemholder2.hxx3
-rw-r--r--svtools/inc/svtools/acceleratorexecute.hxx3
-rw-r--r--svtools/inc/svtools/generictoolboxcontroller.hxx4
-rw-r--r--svtools/inc/svtools/imagemgr.hrc2
-rw-r--r--svtools/inc/svtools/imagemgr.hxx2
-rw-r--r--svtools/inc/svtools/inettbc.hxx2
-rw-r--r--svtools/inc/svtools/optionsdrawinglayer.hxx4
-rw-r--r--svtools/inc/svtools/popupmenucontrollerbase.hxx7
-rw-r--r--svtools/inc/svtools/svxbox.hxx2
-rw-r--r--svtools/inc/svtools/unitconv.hxx1
-rw-r--r--svtools/source/config/itemholder2.cxx2
-rw-r--r--svtools/source/config/itemholder2.hxx3
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx4
-rw-r--r--svtools/source/config/printoptions.cxx5
-rw-r--r--svtools/source/config/test/test.cxx11
-rw-r--r--svtools/source/contnr/fileview.src2
-rw-r--r--svtools/source/contnr/templwin.src2
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx2
-rw-r--r--svtools/source/misc/imagemgr.src1
-rw-r--r--svtools/source/misc/langtab.src1
-rw-r--r--svtools/source/misc/undo.src2
-rw-r--r--svtools/source/uno/generictoolboxcontroller.cxx10
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx12
-rw-r--r--svx/inc/svx/SmartTagCtl.hxx2
-rw-r--r--svx/inc/svx/SmartTagItem.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx2
-rw-r--r--svx/inc/svx/charmap.hxx2
-rw-r--r--svx/inc/svx/checklbx.hxx3
-rw-r--r--svx/inc/svx/chrtitem.hxx2
-rw-r--r--svx/inc/svx/connctrl.hxx2
-rw-r--r--svx/inc/svx/dialmgr.hxx2
-rw-r--r--svx/inc/svx/dlgctrl.hxx2
-rw-r--r--svx/inc/svx/dlgutil.hxx1
-rw-r--r--svx/inc/svx/drawitem.hxx2
-rw-r--r--svx/inc/svx/exthelpid.hrc1
-rw-r--r--svx/inc/svx/fmresids.hrc1
-rw-r--r--svx/inc/svx/fntctl.hxx2
-rw-r--r--svx/inc/svx/fntctrl.hxx2
-rw-r--r--svx/inc/svx/fntszctl.hxx2
-rw-r--r--svx/inc/svx/fontwork.hxx2
-rw-r--r--svx/inc/svx/graphctl.hxx2
-rw-r--r--svx/inc/svx/hdft.hxx2
-rw-r--r--svx/inc/svx/hyperdlg.hxx2
-rw-r--r--svx/inc/svx/insctrl.hxx2
-rw-r--r--svx/inc/svx/langbox.hxx2
-rw-r--r--svx/inc/svx/layctrl.hxx3
-rw-r--r--svx/inc/svx/measctrl.hxx2
-rw-r--r--svx/inc/svx/modctrl.hxx2
-rw-r--r--svx/inc/svx/numinf.hxx2
-rw-r--r--svx/inc/svx/numvset.hxx4
-rw-r--r--svx/inc/svx/ofaitem.hxx2
-rw-r--r--svx/inc/svx/optgrid.hxx2
-rw-r--r--svx/inc/svx/pagectrl.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx2
-rw-r--r--svx/inc/svx/paraprev.hxx2
-rw-r--r--svx/inc/svx/passwd.hxx2
-rw-r--r--svx/inc/svx/pfiledlg.hxx2
-rw-r--r--svx/inc/svx/postattr.hxx2
-rw-r--r--svx/inc/svx/pszctrl.hxx2
-rw-r--r--svx/inc/svx/relfld.hxx2
-rw-r--r--svx/inc/svx/stddlg.hxx2
-rw-r--r--svx/inc/svx/strarray.hxx2
-rw-r--r--svx/inc/svx/svxdlg.hxx1
-rw-r--r--svx/inc/svx/svxerr.hxx2
-rw-r--r--svx/inc/svx/tabline.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx2
-rw-r--r--svx/inc/svx/tbxdraw.hxx2
-rw-r--r--svx/inc/svx/txencbox.hxx2
-rw-r--r--svx/inc/svx/txenctab.hxx2
-rw-r--r--svx/inc/svx/xpoly.hxx2
-rw-r--r--svx/inc/svx/xtable.hxx2
-rw-r--r--svx/inc/svx/zoomctrl.hxx2
-rw-r--r--svx/inc/svx/zoomsliderctrl.hxx2
-rw-r--r--svx/source/dialog/bmpmask.src2
-rw-r--r--svx/source/dialog/contdlg.src2
-rw-r--r--svx/source/dialog/dialmgr.cxx2
-rw-r--r--svx/source/dialog/langbox.src2
-rw-r--r--svx/source/dialog/srchctrl.hxx3
-rw-r--r--svx/source/dialog/srchdlg.src2
-rw-r--r--svx/source/dialog/strarray.cxx2
-rw-r--r--svx/source/dialog/txenctab.src2
-rw-r--r--svx/source/dialog/ucsubset.src1
-rw-r--r--svx/source/inc/recoveryui.hxx3
-rw-r--r--svx/source/items/svxitems.src1
-rw-r--r--svx/source/unodraw/recoveryui.cxx3
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx2
-rw-r--r--sw/source/ui/inc/bookctrl.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx2
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx1
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx1
-rw-r--r--sysui/source/win32/misc/AutoBuffer.cxx4
-rw-r--r--sysui/source/win32/misc/AutoBuffer.hxx4
-rw-r--r--sysui/source/win32/misc/WinImplHelper.cxx4
-rw-r--r--sysui/source/win32/misc/WinImplHelper.hxx4
-rw-r--r--sysui/source/win32/misc/resourceprovider.cxx4
-rw-r--r--sysui/source/win32/misc/resourceprovider.hxx4
-rw-r--r--ucbhelper/inc/ucbhelper/interceptedinteraction.hxx3
-rw-r--r--ucbhelper/source/client/interceptedinteraction.cxx4
-rw-r--r--unotools/inc/unotools/compatibility.hxx4
-rw-r--r--unotools/inc/unotools/itemholderbase.hxx3
-rw-r--r--unotools/inc/unotools/viewoptions.hxx4
-rw-r--r--unotools/inc/unotools/workingsetoptions.hxx4
-rw-r--r--unotools/source/config/compatibility.cxx5
-rw-r--r--unotools/source/config/itemholder1.cxx2
-rw-r--r--unotools/source/config/itemholder1.hxx3
-rw-r--r--unotools/source/config/viewoptions.cxx4
-rw-r--r--uui/source/fltdlg.cxx7
-rw-r--r--uui/source/fltdlg.hxx4
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.hxx4
-rw-r--r--vcl/inc/generic/gensys.h1
-rw-r--r--vcl/inc/unx/saldata.hxx1
-rw-r--r--vcl/inc/unx/saldisp.hxx1
-rw-r--r--vcl/inc/unx/salframe.h1
-rw-r--r--vcl/inc/unx/salgdi.h1
-rw-r--r--vcl/inc/unx/salinst.h1
-rw-r--r--vcl/inc/unx/salstd.hxx1
-rw-r--r--vcl/inc/unx/salvd.h1
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx1
-rw-r--r--vcl/inc/vcl/abstdlg.hxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx3
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx4
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx3
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx3
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.hxx4
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx4
-rw-r--r--xmloff/inc/DomBuilderContext.hxx5
-rw-r--r--xmloff/source/xforms/SchemaContext.hxx5
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.hxx5
-rw-r--r--xmloff/source/xforms/SchemaSimpleTypeContext.hxx5
-rw-r--r--xmloff/source/xforms/TokenContext.hxx5
-rw-r--r--xmloff/source/xforms/XFormsBindContext.hxx5
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.hxx5
-rw-r--r--xmloff/source/xforms/XFormsModelContext.hxx5
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.hxx5
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc2
810 files changed, 32 insertions, 4199 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 960848086382..78d0dbc0f341 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
#define _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XContainer.hpp>
@@ -36,9 +32,6 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <vector>
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
#include "basecontrol.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 65bcf5aaf139..9ec160cc6519 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
#define _UNOCONTROLS_BASECONTROL_CTRL_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/awt/XKeyListener.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/KeyEvent.hpp>
@@ -91,9 +87,6 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/component.hxx>
-//____________________________________________________________________________________________________________
-// includes of my project
-//____________________________________________________________________________________________________________
#include "multiplexer.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index fa481b288fb3..9d1fdba51e63 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_MULTIPLEXER_HXX
#define _UNOCONTROLS_MULTIPLEXER_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/awt/XKeyListener.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/KeyEvent.hpp>
@@ -49,9 +45,6 @@
#include <com/sun/star/awt/PosSize.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
//____________________________________________________________________________________________________________
// "namespaces"
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 1dba2e4b537a..83bedbf3cfc5 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -17,22 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//____________________________________________________________________________________________________________
-// my own includes
-//____________________________________________________________________________________________________________
-
#include "basecontainercontrol.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
#include <cppuhelper/typeprovider.hxx>
//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
// namespaces
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 6d48c7bd2227..e600fd0713ba 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -17,15 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//____________________________________________________________________________________________________________
-// my own include
-//____________________________________________________________________________________________________________
-
#include "basecontrol.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XDisplayBitmap.hpp>
#include <com/sun/star/awt/DeviceInfo.hpp>
@@ -34,10 +27,6 @@
#include <cppuhelper/typeprovider.hxx>
//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
// namespaces
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 50dd26c279b5..4d659f465a38 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -29,10 +25,6 @@
#include <stdio.h>
-//______________________________________________________________________________________________________________
-// includes of my own project
-//______________________________________________________________________________________________________________
-
//=============================================================================
// Add new include line to use new services.
//=============================================================================
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index c20854c56c0d..9e26a8a44b02 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -17,19 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//______________________________________________________________________________________________________________
-// my own include
-//______________________________________________________________________________________________________________
-
#include "OConnectionPointContainerHelper.hxx"
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
-//______________________________________________________________________________________________________________
-// include of my own project
-//______________________________________________________________________________________________________________
#include "OConnectionPointHelper.hxx"
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index 21c51f42c2e7..eb9229627e53 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -17,19 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//______________________________________________________________________________________________________________
-// my own include
-//______________________________________________________________________________________________________________
-
#include "OConnectionPointHelper.hxx"
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
-//______________________________________________________________________________________________________________
-// include of my own project
-//______________________________________________________________________________________________________________
#include "OConnectionPointContainerHelper.hxx"
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 2895e4616982..424f6a37e8a4 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -17,16 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//______________________________________________________________________________________________________________
-// my own include
-//______________________________________________________________________________________________________________
-
#include "framecontrol.hxx"
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
@@ -38,10 +30,6 @@
#include <osl/diagnose.h>
//______________________________________________________________________________________________________________
-// include of my own project
-//______________________________________________________________________________________________________________
-
-//______________________________________________________________________________________________________________
// namespaces
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index fb647a8bc936..0b2487c42415 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -16,15 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//____________________________________________________________________________________________________________
-// my own includes
-//____________________________________________________________________________________________________________
#include "progressbar.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/RasterOperation.hpp>
#include <com/sun/star/awt/Gradient.hpp>
@@ -36,10 +30,6 @@
#include <limits.h>
//____________________________________________________________________________________________________________
-// includes of my project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
// namespace
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 0b7c33a7e47f..b034f12df241 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -17,15 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//____________________________________________________________________________________________________________
-// my own includes
-//____________________________________________________________________________________________________________
-
#include "progressmonitor.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/RasterOperation.hpp>
#include <com/sun/star/awt/Gradient.hpp>
@@ -35,9 +28,7 @@
#include <tools/debug.hxx>
#include <tools/solar.h>
#include <algorithm>
-//____________________________________________________________________________________________________________
-// includes of my project
-//____________________________________________________________________________________________________________
+
#include "progressbar.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index f0908660890e..2602407e4220 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -17,22 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//____________________________________________________________________________________________________________
-// my own includes
-//____________________________________________________________________________________________________________
-
#include "statusindicator.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
#include <com/sun/star/awt/InvalidateStyle.hpp>
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <cppuhelper/typeprovider.hxx>
-//____________________________________________________________________________________________________________
-// includes of my project
-//____________________________________________________________________________________________________________
#include "progressbar.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 66af0583576d..c3f60ad47eb5 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -20,20 +20,12 @@
#ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
#define _OCONNECTIONPOINTCONTAINERHELPER_HXX
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XConnectionPointContainer.hpp>
#include <com/sun/star/lang/XConnectionPoint.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/propshlp.hxx>
//______________________________________________________________________________________________________________
-// includes of my own project
-//______________________________________________________________________________________________________________
-
-//______________________________________________________________________________________________________________
// namespaces
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 9b7ad8f70a56..94256e3dd29b 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -20,18 +20,11 @@
#ifndef _OCONNECTIONPOINTHELPER_HXX
#define _OCONNECTIONPOINTHELPER_HXX
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XConnectionPointContainer.hpp>
#include <com/sun/star/lang/XConnectionPoint.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/propshlp.hxx>
-//______________________________________________________________________________________________________________
-// includes of my own project
-//______________________________________________________________________________________________________________
#include "OConnectionPointContainerHelper.hxx"
//______________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index d67113392df7..52db066d325f 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
#define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
-
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@@ -34,9 +30,6 @@
#include <com/sun/star/lang/XConnectionPointContainer.hpp>
#include <cppuhelper/propshlp.hxx>
-//______________________________________________________________________________________________________________
-// includes of my own project
-//______________________________________________________________________________________________________________
#include "basecontrol.hxx"
#include "OConnectionPointContainerHelper.hxx"
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index b23070833751..c71841118d0d 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -20,16 +20,9 @@
#ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
#define _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
#include "basecontrol.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 680f0958982c..6d72c4b37a13 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
#define _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/awt/XFileDialog.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/awt/XListBox.hpp>
@@ -65,9 +61,6 @@
#include <vector>
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
#include "basecontainercontrol.hxx"
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index cb3595aaea5f..50f212a6f5cf 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -20,10 +20,6 @@
#ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
#define _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/awt/XFixedText.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
@@ -34,9 +30,6 @@
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
#include "basecontainercontrol.hxx"
//____________________________________________________________________________________________________________
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 9ee03eb06bdb..a9ec1a2f376c 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#ifdef WNT
#include <prewin.h>
#include <postwin.h>
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 14f17bbf936e..f16448698f29 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -26,23 +26,13 @@
*
************************************************************************/
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
#include "soundhandler.hxx"
#include <comphelper/mediadescriptor.hxx>
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
-//_________________________________________________________________________________________________________________
-// includes of other projects
-//_________________________________________________________________________________________________________________
#include <comphelper/sequenceashashmap.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index d76bd13df5b7..b48d61947996 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -29,10 +29,6 @@
#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
@@ -46,9 +42,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
#include <cppuhelper/weak.hxx>
#include <vcl/timer.hxx>
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 7c22f81d2f8c..4a48c03b9099 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -39,10 +39,6 @@
// by 3, as each triangle primitive
// has 3 vertices)
-
-//////////////////////////////////////////////////////////////////////////////////
-// includes
-//////////////////////////////////////////////////////////////////////////////////
#include <vcl/syschild.hxx>
#include <vcl/window.hxx>
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 449c2e6ff31c..ec4e17a0f41a 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
#define _COMPHELPER_CONFIGURATIONHELPER_HXX_
-//_______________________________________________
-// includes
-
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index a865dcbe546f..8cfbb5e0c29b 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_LOCALE_HXX_
#define _COMPHELPER_LOCALE_HXX_
-//_______________________________________________
-// includes
-
#include <vector>
#include <rtl/ustring.hxx>
#include "comphelper/comphelperdllapi.h"
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 23eba2713bcd..cc70de0c5eed 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_MEDIADESCRIPTOR_HXX_
#define _COMPHELPER_MEDIADESCRIPTOR_HXX_
-//_______________________________________________
-// includes
-
#include <comphelper/sequenceashashmap.hxx>
#include <rtl/ustring.hxx>
#include "comphelper/comphelperdllapi.h"
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index ada17b72d4ee..128152f0eab6 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_NUMBEREDCOLLECTION_HXX_
#define _COMPHELPER_NUMBEREDCOLLECTION_HXX_
-//_______________________________________________
-// includes
-
#include "comphelper/comphelperdllapi.h"
#include <com/sun/star/uno/Reference.hxx>
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 7dc83a2670e2..a697cf55994b 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
#define _COMPHELPER_SEQUENCEASHASHMAP_HXX_
-//_______________________________________________
-// includes
-
#include <boost/unordered_map.hpp>
#include <algorithm>
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 80b20017c438..3f63fb9c6613 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -20,9 +20,6 @@
#ifndef _COMPHELPER_SEQUENCEASVECTOR_HXX_
#define _COMPHELPER_SEQUENCEASVECTOR_HXX_
-//_______________________________________________
-// includes
-
#include <vector>
#include <algorithm>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
index f73fd14b1616..2e060bf7cacd 100644
--- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
+++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
@@ -20,8 +20,6 @@
#ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
#define _COMPHELPER_STRILLREADWRITEINTERACTION_HXX_
-//_______________________________________________
-// includes
#include <ucbhelper/interceptedinteraction.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 2a056347b093..6dc055037c8c 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//_______________________________________________
-// includes
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index bad180286b6a..2bf4c35bb11a 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -19,8 +19,6 @@
#include <comphelper/locale.hxx>
-//_______________________________________________
-// includes
#include <rtl/ustrbuf.hxx>
//_______________________________________________
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index d433d53b7889..89b375576605 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -20,9 +20,6 @@
#include <comphelper/numberedcollection.hxx>
-//_______________________________________________
-// includes
-
#include <com/sun/star/frame/UntitledNumbersConst.hpp>
//_______________________________________________
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 97dfcc5dd8a1..d7e87baca6ec 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//_______________________________________________
-// includes
#include <comphelper/sequenceashashmap.hxx>
//_______________________________________________
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 874ac854fe14..912f191b28e3 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include "cuires.hrc"
#include "acccfg.hrc"
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 2fbb572241fe..8887adc4bbec 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-// include ***************************************************************
#include <svtools/svmedit.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/document/XEventsSupplier.hpp>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 826d872948bf..e25c72984213 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-// include ---------------------------------------------------------------
-
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 54c966fb6bf5..845b5d274c79 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
-
#include <cuires.hrc>
#include "charmap.hrc"
#include "helpid.hrc"
diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src
index 5403a774dee4..33976e33cee4 100644
--- a/cui/source/dialogs/commonlingui.src
+++ b/cui/source/dialogs/commonlingui.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "helpid.hrc"
#include "hangulhanjadlg.hrc"
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index b6f027e0dc04..14c464c14510 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// include ------------------------------------------------------------------
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "dlgname.hrc"
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f8bf26202bfa..fb01272f4342 100644
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include "cuires.hrc"
#include "hyphen.hrc"
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index ef48e0656ca7..22a672a874d6 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "postdlg.hrc"
#include "helpid.hrc"
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 840d81b669fa..5d193d33dab4 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "srchxtra.hrc"
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 43787813d87d..22cb65a9fcb3 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "zoom.hrc"
#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 0a9c5beba5b9..c1a99fc6e9e4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -28,7 +28,6 @@
#ifndef _CUI_DLGFACT_HXX
#define _CUI_DLGFACT_HXX
-// include ---------------------------------------------------------------
#include <svx/svxdlg.hxx>
#include <com/sun/star/container/XNameReplace.hpp>
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index c58ff7ba1527..98465977be30 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SPELLDDIALOG_HXX
#define _SVX_SPELLDDIALOG_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/basedlgs.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 1a4e75b19a47..4ad99d0895b5 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -28,8 +28,6 @@
#ifndef _ABOUT_HXX
#define _ABOUT_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/button.hxx>
#include <vcl/accel.hxx>
#include <svtools/svmedit.hxx>
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 81c8f4212544..72e91e9f1d85 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ALIGN_HXX
#define _SVX_ALIGN_HXX
-// include ---------------------------------------------------------------
-
#include <svx/orienthelper.hxx>
#include <vcl/field.hxx>
#include <vcl/button.hxx>
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 52b9c83a01a7..eec42f800062 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BACKGRND_HXX
#define _SVX_BACKGRND_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/group.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/graph.hxx>
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index ded144041030..4fd509167314 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BBDLG_HXX
#define _SVX_BBDLG_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/tabdlg.hxx>
/*--------------------------------------------------------------------
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index e3a9d0847f82..e8169f163052 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_BORDER_HXX
#define _SVX_BORDER_HXX
-// include ---------------------------------------------------------------
-
-
#include <svtools/ctrlbox.hxx>
#include <vcl/group.hxx>
#include <vcl/field.hxx>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 6afa2428f646..72652ce239c3 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CHARDLG_HXX
#define _SVX_CHARDLG_HXX
-// include ---------------------------------------------------------------
-
#include <svtools/ctrlbox.hxx>
#include <svtools/stdctrl.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 57cdcc3c73a6..2cf42b78c5d8 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CONNECT_HXX
#define _SVX_CONNECT_HXX
-// include ---------------------------------------------------------------
-
#include <svx/connctrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 537a0e134b64..8ccb2ad55eae 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -28,8 +28,6 @@
#ifndef _CUI_CHARMAP_HXX
#define _CUI_CHARMAP_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/ctrl.hxx>
#include <vcl/metric.hxx>
#include <vcl/button.hxx>
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 19f2e6c977a2..b1cd1b56ec66 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -20,8 +20,6 @@
#ifndef _CUI_TAB_HYPERLINK_HXX
#define _CUI_TAB_HYPERLINK_HXX
-// include ---------------------------------------------------------------
-
#include <svx/hlnkitem.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx>
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index e6e380399d39..2ac61034f1cb 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -19,8 +19,6 @@
#ifndef _SVX_CUIOPTGENRL_HXX
#define _SVX_CUIOPTGENRL_HXX
-// include ---------------------------------------------------------------
-
#include <svx/optgenrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index b7f5fa68362b..8b3ec7d46c64 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -28,8 +28,6 @@
#ifndef _CUI_TAB_AREA_HXX
#define _CUI_TAB_AREA_HXX
-// include ---------------------------------------------------------------
-
#include <svtools/valueset.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 7fb7e04ba75d..7630371ad7ef 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -28,7 +28,6 @@
#ifndef _CUI_TAB_LINE_HXX
#define _CUI_TAB_LINE_HXX
-// include ---------------------------------------------------------------
#include <vector>
#include <svx/tabline.hxx>
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 88449b645241..5b202df2e2da 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -19,8 +19,6 @@
#ifndef _CUI_DIALMGR_HXX
#define _CUI_DIALMGR_HXX
-// include ---------------------------------------------------------------
-
#include <tools/resid.hxx>
// forward ---------------------------------------------------------------
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 4bc739f12628..fb1991fc8a01 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -26,7 +26,6 @@
************************************************************************/
#ifndef _CUI_HELPID_HRC
#define _CUI_HELPID_HRC
-// include ---------------------------------------------------------------
#include <svx/svxcommands.h>
#include <sfx2/sfxcommands.h>
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index d112517e371e..128fb501ad5d 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -19,8 +19,6 @@
#ifndef _SVX_HYPHEN_HXX
#define _SVX_HYPHEN_HXX
-// include ---------------------------------------------------------------
-
#include <memory>
#include <vcl/edit.hxx>
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 14fbc1e82160..e9829c64b149 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_LABDLG_HXX
#define _SVX_LABDLG_HXX
-// include ---------------------------------------------------------------
-
-
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 746f2bae9ccd..e78ea5c5c8f3 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_MEASURE_HXX
#define _SVX_MEASURE_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index a55f029b12d2..0ced5921502d 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_MULTIFIL_HXX
#define _SVX_MULTIFIL_HXX
-// include ---------------------------------------------------------------
-
#include "multipat.hxx"
// #97807# ----------------------------------------------------
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index f8cbc06ef969..3e93aa324d42 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_MULTIPAT_HXX
#define _SVX_MULTIPAT_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/dialog.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 1cde79e2715b..70a83882c0f7 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -19,8 +19,6 @@
#ifndef _SVX_NUMPAGES_HXX
#define _SVX_NUMPAGES_HXX
-// include ---------------------------------------------------------------
-
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index d3b2696aafba..3bd7a47d0fdd 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPTDICT_HXX
#define _SVX_OPTDICT_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index a9e9d091d633..e594f1d313f2 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPTLINGU_HXX
#define _SVX_OPTLINGU_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
#include <vcl/toolbox.hxx>
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 96ee62330264..5617ea95d382 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPTPATH_HXX
#define _SVX_OPTPATH_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index ba71a2c174c5..a9be70bbb0d1 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PARAGRPH_HXX
#define _SVX_PARAGRPH_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 953fbef882e2..d0d6b9a4e0ea 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_POSTDLG_HXX
#define _SVX_POSTDLG_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/group.hxx>
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index f7f8aea4a8bd..c0f4764b3ab2 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_RADIOBTNBOX_HXX
#define _SVX_RADIOBTNBOX_HXX
-// include ---------------------------------------------------------------
-
#include <svx/simptabl.hxx>
namespace svx {
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index 7fd0cedd4670..0c76c623d568 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SRCHXTRA_HXX
#define _SVX_SRCHXTRA_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/field.hxx>
#include <svtools/ctrltool.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 1f054d34c69e..27c65a8ccc62 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TABSTPGE_HXX
#define _SVX_TABSTPGE_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 0c4f5c45b5e0..6338929dd289 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TEXTANIM_HXX
#define _SVX_TEXTANIM_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/field.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/svdattr.hxx>
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 100fc52f10bc..f9352c7c697f 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TEXTATTR_HXX
#define _SVX_TEXTATTR_HXX
-// include ---------------------------------------------------------------
-
#include <svx/dlgctrl.hxx>
#include <vcl/group.hxx>
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 2cfd74f81173..bb54fc727905 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TRANSFRM_HXX
#define _SVX_TRANSFRM_HXX
-// include ---------------------------------------------------------------
-
#include <svx/dlgctrl.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index d8e12c4221d1..39ebb5c80e88 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ZOOM_HXX
#define _SVX_ZOOM_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
#include <vcl/field.hxx>
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 6dee389aa501..acdc43a6fc69 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -28,8 +28,6 @@
#ifndef SVX_OPTCOLOR_HXX
#define SVX_OPTCOLOR_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 6f1ab4ed9132..5f2edda76bc6 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -24,7 +24,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
#include <cuires.hrc>
#include "optgdlg.hrc"
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index c3b194a6536a..8f5e63f3bd25 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-// include ------------------------------------------------------------------
-
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index cc471034dfae..b27b818f39ea 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -25,7 +25,6 @@
*
************************************************************************/
- // include -----------------------------------------------------------------
#include "opthtml.hrc"
#include <cuires.hrc>
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 47df743d9293..714b4726ffc3 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPTJAVA_HXX
#define _SVX_OPTJAVA_HXX
-// include ---------------------------------------------------------------
-
#include <vector>
#include <ucbhelper/content.hxx>
#include <vcl/button.hxx>
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 0044646e359c..d8c17d4c00ac 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -25,8 +25,6 @@
*
************************************************************************/
- // include --------------------------------------------------------------
-
#include "optjava.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 7a5c9268b7f1..15f37755c50f 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-// include ------------------------------------------------------------------
-
#include "optlingu.hrc"
#include "helpid.hrc"
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 3d0570989e64..f55000555041 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -25,8 +25,6 @@
*
************************************************************************/
- // include ---------------------------------------------------------------
-
#include <cuires.hrc>
#include "optmemory.hrc"
#include "helpid.hrc"
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index c3d64ccb1b82..22a499c005ad 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPTSAVE_HXX
#define _SVX_OPTSAVE_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/group.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index d5a6e92d7eac..7d5cf0af5ed3 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -25,7 +25,6 @@
*
************************************************************************/
- // include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include <cuires.hrc>
#include "helpid.hrc"
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index c21999fdb4fd..745cdcd3a811 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -29,8 +29,6 @@
#ifndef _SVX_OPTUPDT_HXX
#define _SVX_OPTUPDT_HXX
-// include ---------------------------------------------------------------
-
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <com/sun/star/container/XNameReplace.hpp>
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 900ece49322e..2fdcf20d524b 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -25,7 +25,6 @@
*
************************************************************************/
-// include --------------------------------------------------------------
#include "optupdt.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index 4e946bfbfd9a..8806ab5e6fc5 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-// include --------------------------------------------------------------
-
#include <svtools/controldims.hrc>
#include "securityoptions.hrc"
#include <cuires.hrc>
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 86c3a52509f6..af20fd461ff6 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-// include --------------------------------------------------------------
-
#include <svtools/controldims.hrc>
#include "webconninfo.hrc"
#include <cuires.hrc>
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 5f922bc13e2e..c6e02bbd3176 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "helpid.hrc"
#include "align.hrc"
diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src
index 0102e09972c9..feb7090f74d9 100644
--- a/cui/source/tabpages/bbdlg.src
+++ b/cui/source/tabpages/bbdlg.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index a7c239e0486f..68f1e85c10d4 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "border.hrc"
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index b6673ccc706d..74b17139afcf 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "chardlg.hrc"
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index ed5108c90d6a..e9c373164c2c 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -25,7 +25,6 @@
*
************************************************************************/
-// include ---------------------------------------------------------------
#include <cuires.hrc>
#include "dstribut.hrc"
#include "helpid.hrc"
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index 0f12c8d6c05c..06552335bebd 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include "labdlg.hrc"
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 27b07f6fb3d6..909761683998 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "helpid.hrc"
#include "numfmt.hrc"
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 0026f9a6dd1a..e79fa45afac3 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -25,8 +25,6 @@
*
************************************************************************/
- // include ---------------------------------------------------------------
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "page.hrc"
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index 3ac2c7f69c46..6d5ae543e109 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include <cuires.hrc>
#include "helpid.hrc"
#include "paragrph.hrc"
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index 4f39be3c957b..f9ba6ab879cf 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ------------------------------------------------------------------
+
#include <cuires.hrc>
String RID_SVXSTR_DESC_GRADIENT
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index 619fe8656570..c1f51591ba66 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ------------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "swpossizetabpage.hrc"
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index c704969d6012..c824b8a5fa0d 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "tabarea.hrc"
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index 05350581abb1..659c9fae7013 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ------------------------------------------------------------------
+
#include <cuires.hrc>
#include "helpid.hrc"
#include "tabline.hrc"
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 1b309832becc..26a73a15256e 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include "helpid.hrc"
#include <cuires.hrc>
#include "tabstpge.hrc"
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index 89f4dc8f5049..15f00d68f5e5 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // include ---------------------------------------------------------------
+
#include <svtools/controldims.hrc>
#include <cuires.hrc>
#include "textattr.hrc"
diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src
index d7dc1c164bc8..562f691ce70c 100644
--- a/cui/source/tabpages/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ------------------------------------------------------------------
+
#include <svtools/controldims.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 80b16b870706..38f1fb782e1e 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "mcnttfactory.hxx"
#include "mcnttype.hxx"
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 5b6a49ef1031..1a3dcf848f2c 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -21,10 +21,6 @@
#ifndef _MCNTTFACTORY_HXX_
#define _MCNTTFACTORY_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <cppuhelper/compbase2.hxx>
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 5f4319b3afab..771422fd0263 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "mcnttype.hxx"
//------------------------------------------------------------------------
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 9d630b413b42..09b2fddd4496 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -21,10 +21,6 @@
#ifndef _MCNTTYPE_HXX_
#define _MCNTTYPE_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <cppuhelper/compbase1.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 223dc6716789..913fc037882e 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//-----------------------------------------------------------------
-// includes of other projects
-//-----------------------------------------------------------------
#include <cppuhelper/factory.hxx>
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index 943a57c78551..61a91e608533 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//_________________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________________
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index f43fb8d8e17f..4fa8c798ea05 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -21,10 +21,6 @@
#ifndef _DTOBJFACTORY_HXX_
#define _DTOBJFACTORY_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <cppuhelper/servicefactory.hxx>
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index fac718c58210..3c735c7deaea 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// interface includes
-//------------------------------------------------------------------------
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardManager.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
@@ -27,11 +24,6 @@
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-//------------------------------------------------------------------------
-// other includes
-//------------------------------------------------------------------------
-
-
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 6b38aaac9fd6..faeb993502db 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "WinClipbImpl.hxx"
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index 9f3c0fd672d8..51100caa8a9b 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -21,10 +21,6 @@
#ifndef _WINCLIPBIMPL_HXX_
#define _WINCLIPBIMPL_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 91be18d0664a..d5111f270f8c 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "WinClipboard.hxx"
#include <com/sun/star/datatransfer/clipboard/ClipboardEvent.hpp>
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 4c31bae0e6b6..9554e298aeb8 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -21,11 +21,6 @@
#ifndef _WINCLIPBOARD_HXX_
#define _WINCLIPBOARD_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <cppuhelper/compbase4.hxx>
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 2cf7860791e5..f8973a9f2e83 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//______________________________________________________________________________________________________________
-// includes of other projects
-//______________________________________________________________________________________________________________
#include <cppuhelper/factory.hxx>
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 1a489e6b7e38..53e67a733e95 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "APNDataObject.hxx"
#include <osl/diagnose.h>
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 242df7b4c60c..003a02ab2c63 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <sal/types.h>
#include <rtl/process.h>
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 7e10f72aac8c..b19bda4b090c 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -21,10 +21,6 @@
#ifndef _DOTRANSFERABLE_HXX_
#define _DOTRANSFERABLE_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <cppuhelper/implbase2.hxx>
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index 32e693353916..ee7352c83f0f 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <rtl/ustring.h>
#include <osl/diagnose.h>
#include "DTransHelper.hxx"
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 0ce61c64bdc5..209e504d9d4a 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -21,10 +21,6 @@
#ifndef _DTRANSHELPER_HXX_
#define _DTRANSHELPER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#if defined _MSC_VER
#pragma warning(push,1)
#endif
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 5c55001207c4..cfbb5e169ded 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "DataFmtTransl.hxx"
#include <rtl/string.hxx>
#include <osl/diagnose.h>
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 745876999b9b..1c7fa2794e75 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -21,10 +21,6 @@
#ifndef _DATAFMTTRANSL_HXX_
#define _DATAFMTTRANSL_HXX_
-//-----------------------------------------------
-// includes
-//-----------------------------------------------
-
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index 90459dfde452..07328796880e 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "../../inc/DtObjFactory.hxx"
#include "XTDataObject.hxx"
diff --git a/dtrans/source/win32/dtobj/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index 48d7448697c0..3a7284f60c62 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "Fetc.hxx"
#include "../misc/ImplHelper.hxx"
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index f0e73650b76c..3d02afa16b5c 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -21,10 +21,6 @@
#ifndef _FETC_HXX_
#define _FETC_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#if defined _MSC_VER
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index f973aa85cca1..7031dacda8ea 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "FetcList.hxx"
#include "Fetc.hxx"
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index 3ded8bcda6a4..5a013b5a5f98 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -21,10 +21,6 @@
#ifndef _FETCLIST_HXX_
#define _FETCLIST_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index fd3e3490705f..1bd0d31fc78b 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -21,10 +21,6 @@
#ifndef _MIMEATTRIB_HXX_
#define _MIMEATTRIB_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <rtl/ustring.hxx>
//------------------------------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 54be5bd4c2fb..2f5128c5f59d 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "TxtCnvtHlp.hxx"
#include "DTransHelper.hxx"
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 611d666cf455..c0e172ddc994 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -21,11 +21,6 @@
#ifndef _XNOTIFYINGDATAOBJECT_HXX_
#define _XNOTIFYINGDATAOBJECT_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index a28f86635c99..a8e2ad2818ae 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "XTDataObject.hxx"
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 9789b2d0f62c..c54040d218a6 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -21,11 +21,6 @@
#ifndef _XTDATAOBJECT_HXX_
#define _XTDATAOBJECT_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 491aa3e192df..6ab60d385ad3 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "ftransl.hxx"
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 220d097ee1f2..5c8df8ab6dc8 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -21,10 +21,6 @@
#ifndef _FTRANSL_HXX_
#define _FTRANSL_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <cppuhelper/compbase2.hxx>
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 8e40e53fc5ba..eecdb3c486f2 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//-----------------------------------------------------------------
-// includes of other projects
-//-----------------------------------------------------------------
#include <cppuhelper/factory.hxx>
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 99ad724c8c22..c72c23c5a401 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "ImplHelper.hxx"
#include <rtl/tencinfo.h>
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index e5c5045142d2..682aaf87d863 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -21,10 +21,6 @@
#ifndef _IMPLHELPER_HXX_
#define _IMPLHELPER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx
index dc1d585ebfed..66cfd2922540 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/win32/misc/WinClip.hxx
@@ -21,11 +21,6 @@
#ifndef _WINCLIP_HXX_
#define _WINCLIP_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
//------------------------------------------------------------------------
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx
index f08575175837..20ac2f0dae8e 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "../DTransHelper.hxx"
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 4a38f49070c2..5d87dbcc8355 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -21,11 +21,6 @@
#ifndef _XTDATAOBJECT_HXX_
#define _XTDATAOBJECT_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#if defined _MSC_VER
#pragma warning(push,1)
#endif
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 8f6e5eb0d39b..6cc69e2e706b 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -17,15 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//_________________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________________
-
#include "../misc/ImplHelper.hxx"
-//_________________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________________
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/workbench/testmarshal.cxx b/dtrans/source/win32/workbench/testmarshal.cxx
index 7ea6df68d995..30d8fe48b2c1 100644
--- a/dtrans/source/win32/workbench/testmarshal.cxx
+++ b/dtrans/source/win32/workbench/testmarshal.cxx
@@ -17,13 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//_________________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________________
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index e34e66f8c4c9..646d8b3b11cc 100644
--- a/editeng/inc/editeng/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
@@ -28,8 +28,6 @@
#ifndef _SVXACCFG_HXX
#define _SVXACCFG_HXX
-// include ---------------------------------------------------------------
-
#include "editeng/editengdllapi.h"
#include <unotools/configitem.hxx>
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index b4a73ecfaf84..6e899dcafa8d 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ADJITEM_HXX
#define _SVX_ADJITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/eeitem.hxx>
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index dd8856a18164..4abdf82d0892 100644
--- a/editeng/inc/editeng/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_AKRNITEM_HXX
#define _SVX_AKRNITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index fa24b287cba4..45926427acb9 100644
--- a/editeng/inc/editeng/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BLNKITEM_HXX
#define _SVX_BLNKITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index df843ea10f83..44d6c14558da 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -28,10 +28,6 @@
#ifndef _SVX_BOLNITEM_HXX
#define _SVX_BOLNITEM_HXX
-// include ---------------------------------------------------------------
-
-
-
#include <svl/poolitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 4e8f6efb5a28..05dac1c5ed9e 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BRKITEM_HXX
#define _SVX_BRKITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index b3c314002999..44c7b03a319d 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BRSHITEM_HXX
#define _SVX_BRSHITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <vcl/wall.hxx>
#include <tools/link.hxx>
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 2a5f3b1cf28e..178b16d8f3bd 100644
--- a/editeng/inc/editeng/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_BULITEM_HXX
#define _SVX_BULITEM_HXX
-// include ---------------------------------------------------------------
-
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index bf4fbc1bd288..5719780ef45e 100644
--- a/editeng/inc/editeng/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CHARHIDDENITEM_HXX
#define _SVX_CHARHIDDENITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 4a276b26f9c1..36b57105a1e3 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CHARRELIEFITEM_HXX
#define _SVX_CHARRELIEFITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <vcl/fntstyle.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 90fcb3cffb1c..b55cfccfe46d 100644
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CHARROTATEITEM_HXX
#define _SVX_CHARROTATEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index 0fe861583790..40304a8544f6 100644
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CHARSCALEITEM_HXX
#define _SVX_CHARSCALEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 51d52e9ac2c6..60740a6827b1 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CMAPITEM_HXX
#define _SVX_CMAPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index 1e701902ea96..0e5dd7221ac6 100644
--- a/editeng/inc/editeng/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ITEM_HXX
#define _SVX_ITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index b0d369ea1c31..8b40263dfc7c 100644
--- a/editeng/inc/editeng/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_COLRITEM_HXX
#define _SVX_COLRITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <tools/color.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index ca8bf58dfd9b..ba613d63560b 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CRSDITEM_HXX
#define _SVX_CRSDITEM_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index 8c629d3365fd..019edad8968f 100644
--- a/editeng/inc/editeng/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_CSCOITEM_HXX
#define _SVX_CSCOITEM_HXX
-// include ---------------------------------------------------------------
-
#include <tools/string.hxx>
#include <editeng/colritem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc
index 6be9d2028293..beaaaa0dd7ec 100644
--- a/editeng/inc/editeng/editids.hrc
+++ b/editeng/inc/editeng/editids.hrc
@@ -18,8 +18,6 @@
#ifndef _EDIT_SVXIDS_HRC
#define _EDIT_SVXIDS_HRC
-// include ------------------------------------------------------------------
-
#include <svl/solar.hrc>
#define SID_ATTR_BRUSH ( SID_SVX_START + 1 )
diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
index 47ab26629da6..2a752ed099dc 100644
--- a/editeng/inc/editeng/editrids.hrc
+++ b/editeng/inc/editeng/editrids.hrc
@@ -18,8 +18,6 @@
#ifndef _EDIT_RIDS_HRC
#define _EDIT_RIDS_HRC
-// include ------------------------------------------------------------------
-
#include <svl/solar.hrc>
// strings also used in cui
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
index 181b31c12823..6dda1344266e 100644
--- a/editeng/inc/editeng/edtdlg.hxx
+++ b/editeng/inc/editeng/edtdlg.hxx
@@ -19,8 +19,6 @@
#ifndef _EDT_ABSTDLG_HXX
#define _EDT_ABSTDLG_HXX
-// include ---------------------------------------------------------------
-
#include <tools/solar.h>
#include <tools/string.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index eca87ed889db..3100b6236c66 100644
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_EMPHITEM_HXX
#define _SVX_EMPHITEM_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/vclenum.hxx>
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index f14f15ce0409..a19595522afc 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ESCPITEM_HXX
#define _SVX_ESCPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index a8cc34e0d290..fa11bd8d17ee 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_FHGTITEM_HXX
#define _SVX_FHGTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index bcf757cea592..f25a8d2688a6 100644
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_FLSTITEM_HXX
#define _SVX_FLSTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Sequence.h>
diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index 3aac10a7bd90..24fdbf18fa60 100644
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_FONTITEM_HXX
#define _SVX_FONTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <tools/string.hxx>
#include <vcl/font.hxx>
diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index 8db9c11c0a81..2896db2fcd6f 100644
--- a/editeng/inc/editeng/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -19,8 +19,6 @@
#ifndef _SVX_FORBIDDENRULEITEM_HXX
#define _SVX_FORBIDDENRULEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index fc03a21a4d80..d88875e15eba 100644
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_FRMDIRITEM_HXX
#define _SVX_FRMDIRITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/frmdir.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 86e47a753320..fcd4a6c12c78 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_FWDTITEM_HXX
#define _SVX_FWDTITEM_HXX
-// include ---------------------------------------------------------------
-
-
#include <svl/poolitem.hxx>
diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 44eb12455a9b..36ede9560e71 100644
--- a/editeng/inc/editeng/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -19,8 +19,6 @@
#ifndef _SVX_HNGPNCTITEM_HXX
#define _SVX_HNGPNCTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index adef7385b70d..d04341395962 100644
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_HYZNITEM_HXX
#define _SVX_HYZNITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index a5e3c66dde0c..a48f762cd226 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ITEMTYPE_HXX
#define _SVX_ITEMTYPE_HXX
-// include ---------------------------------------------------------------
-
#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
diff --git a/editeng/inc/editeng/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index 4465e566de4e..acaa5de2a8d8 100644
--- a/editeng/inc/editeng/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_KEEPITEM_HXX
#define _SVX_KEEPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index 818148a346a0..b10e1c5c28fb 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_KERNITEM_HXX
#define _SVX_KERNITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index 5e847c0f0159..885877a767d1 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_LANGITEM_HXX
#define _SVX_LANGITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <i18npool/lang.h>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 5af82bc7a6f7..6af0f3bc3c35 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_LCOLITEM_HXX
#define _SVX_LCOLITEM_HXX
-// include ---------------------------------------------------------------
-
#include <editeng/colritem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index e00ff6d79272..d6bae8000e96 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_LRSPITEM_HXX
#define _SVX_LRSPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 056415a5d280..22d64cb532fa 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_LSPCITEM_HXX
#define _SVX_LSPCITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index e96d00c40483..8b20d8989888 100644
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_NHYPITEM_HXX
#define _SVX_NHYPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index d8a41d2629e8..e46eaefb7437 100644
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_NLBKITEM_HXX
#define _SVX_NLBKITEM_HXX
-// include ---------------------------------------------------------------
-
-
#include <svl/eitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index a6ef8e64e336..98b410c3932c 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_NUMITEM_HXX
#define _SVX_NUMITEM_HXX
-// include ---------------------------------------------------------------
-
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <svl/poolitem.hxx>
diff --git a/editeng/inc/editeng/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index c73ae6f28ee4..c0c7b082cb96 100644
--- a/editeng/inc/editeng/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_OPAQITEM_HXX
#define _SVX_OPAQITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/optitems.hxx b/editeng/inc/editeng/optitems.hxx
index 7df07ef50bcf..eb340e218e1e 100644
--- a/editeng/inc/editeng/optitems.hxx
+++ b/editeng/inc/editeng/optitems.hxx
@@ -19,8 +19,6 @@
#ifndef _EDITENG_OPTITEMS_HXX
#define _EDITENG_OPTITEMS_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index 6405e46e6589..59feac103bc3 100644
--- a/editeng/inc/editeng/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ORPHITEM_HXX
#define _SVX_ORPHITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index b13731b13555..ce2b3c6d7a9e 100644
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PARAVERTALIGNITEM_HXX
#define _SVX_PARAVERTALIGNITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index ce5853b2e82c..6377ab0fb24e 100644
--- a/editeng/inc/editeng/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PBINITEM_HXX
#define _SVX_PBINITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index 4431dfccd7cc..fcfc1ef70d04 100644
--- a/editeng/inc/editeng/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PGRDITEM_HXX
#define _SVX_PGRDITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index 4a732d2a91f9..9dcce5c6b599 100644
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PMDLITEM_HXX
#define _SVX_PMDLITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/stritem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index fbea62b702ee..350b09928f0a 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_POSTITEM_HXX
#define _SVX_POSTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index 9c0086b38daf..3a47eecc296e 100644
--- a/editeng/inc/editeng/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PRNTITEM_HXX
#define _SVX_PRNTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index b2975c37963a..780f04ac563a 100644
--- a/editeng/inc/editeng/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_PROTITEM_HXX
#define _SVX_PROTITEM_HXX
-// include ---------------------------------------------------------------
-
-
#include <svl/poolitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index a2b9d59866ea..bfcc38be2dde 100644
--- a/editeng/inc/editeng/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_PRSZITEM_HXX
#define _SVX_PRSZITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index 87e147623cd1..9359355d17c7 100644
--- a/editeng/inc/editeng/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SRIPTSPACEITEM_HXX
#define _SVX_SRIPTSPACEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index 320c06326768..e90899fcaa5c 100644
--- a/editeng/inc/editeng/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SCRIPTTYPEITEM_HXX
#define _SVX_SCRIPTTYPEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <svl/languageoptions.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index c4cf6393ebfd..8f3c7011f680 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SHADITEM_HXX
#define _SVX_SHADITEM_HXX
-// include ---------------------------------------------------------------
-
#include <tools/color.hxx>
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
diff --git a/editeng/inc/editeng/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index adeb059d3a1e..d504fdca13e3 100644
--- a/editeng/inc/editeng/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SHDDITEM_HXX
#define _SVX_SHDDITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index c2b5a397ebf8..679ae50f5573 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SIZEITEM_HXX
#define _SVX_SIZEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index bf50d7e492bb..5f03ef576bf0 100644
--- a/editeng/inc/editeng/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SPLTITEM_HXX
#define _SVX_SPLTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index af61e3b81fbe..2a6d5bdf0306 100644
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_SPLWRAP_HXX
#define _SVX_SPLWRAP_HXX
-// include ---------------------------------------------------------------
-
#include <editeng/svxenum.hxx>
#include <tools/string.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index 6174f1e776c5..aeed3d488d2d 100644
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TSPTITEM_HXX
#define _SVX_TSPTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index cd81d7364dc7..65b599c94125 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_UDLNITEM_HXX
#define _SVX_UDLNITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <vcl/vclenum.hxx>
#include <tools/color.hxx>
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index f09a18d0b153..43eb2d9a2576 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_ULSPITEM_HXX
#define _SVX_ULSPITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index f3978f850a68..d7e481348e9e 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_WGHTITEM_HXX
#define _SVX_WGHTITEM_HXX
-// include ---------------------------------------------------------------
-
#include <vcl/vclenum.hxx>
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index 415035fd86a8..822559a681c9 100644
--- a/editeng/inc/editeng/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_WIDWITEM_HXX
#define _SVX_WIDWITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/intitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index c9db4e153d33..f92052b6b345 100644
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_WRITINGMODEITEM_HXX
#define _SVX_WRITINGMODEITEM_HXX
-// include ---------------------------------------------------------------
-
#include <com/sun/star/text/WritingMode.hpp>
#include <svl/intitem.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index 4e31bbd0d507..80925627cfbf 100644
--- a/editeng/inc/editeng/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_WRLMITEM_HXX
#define _SVX_WRLMITEM_HXX
-// include ---------------------------------------------------------------
-
#include <svl/eitem.hxx>
#include <editeng/editengdllapi.h>
diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src
index 50e845e15d6d..ea280d90753d 100644
--- a/editeng/source/items/page.src
+++ b/editeng/source/items/page.src
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // include ---------------------------------------------------------------
-
#include <editeng/editrids.hrc>
String RID_SVXSTR_PAPERBIN
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 0aac90775665..bc2984b9244d 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -19,8 +19,6 @@
#ifndef _FILTER_HRC
#define _FILTER_HRC
-// include ---------------------------------------------------------------
-
#include <svl/solar.hrc>
// Help-Ids --------------------------------------------------------------
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index f8f26a10a397..87685ee74d38 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -30,8 +30,6 @@
#include "basecontainer.hxx"
#include "constant.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/uno/Type.h>
#include <comphelper/enumhelper.hxx>
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index a4a209772d3f..8354b126b35f 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -28,9 +28,6 @@
#ifndef __FILTER_CONFIG_BASECONTAINER_HXX_
#define __FILTER_CONFIG_BASECONTAINER_HXX_
-//_______________________________________________
-// includes
-
#include "filtercache.hxx"
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index c6790d574af6..70108020886d 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -31,8 +31,6 @@
#include "macros.hxx"
#include "constant.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 486b2994aec8..975434c3125f 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -29,9 +29,6 @@
#ifndef __FILTER_CONFIG_CACHEITEM_HXX_
#define __FILTER_CONFIG_CACHEITEM_HXX_
-//_______________________________________________
-// includes
-
#include <boost/unordered_map.hpp>
#include <deque>
#include <list>
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 090ce6f56d9f..b7f794d451d5 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -30,8 +30,6 @@
#include "cacheupdatelistener.hxx"
#include "constant.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
#include <salhelper/singletonref.hxx>
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index 4b3214aac080..0c51f30fe14a 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -28,9 +28,6 @@
#ifndef __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_
#define __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_
-//_______________________________________________
-// includes
-
#include "filtercache.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index b1c5027e392c..d8ef4321463a 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -30,8 +30,6 @@
#include "configflush.hxx"
#include "constant.hxx"
-//_______________________________________________
-// includes
#include <osl/diagnose.h>
//_______________________________________________
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index 5c75476ab24e..8bbe26619b5d 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -19,9 +19,6 @@
#ifndef __FILTER_CONFIG_CONFIGFLUSH_HXX_
#define __FILTER_CONFIG_CONFIGFLUSH_HXX_
-//_______________________________________________
-// includes
-
#include "cacheitem.hxx"
#include <com/sun/star/util/XRefreshable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index d28d3254fc0c..2aa7fcd50a16 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -33,8 +33,6 @@
#include "constant.hxx"
#include "versions.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/enumhelper.hxx>
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index c54321e0bf71..891bb61ae2e5 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -20,9 +20,6 @@
#ifndef __FILTER_CONFIG_CONTENTHANDLERFACTORY_HXX_
#define __FILTER_CONFIG_CONTENTHANDLERFACTORY_HXX_
-//_______________________________________________
-// includes
-
#include "basecontainer.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 59eb94d57beb..bbb879e5d239 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -37,8 +37,6 @@
#define AS_ENABLE_FILTER_UINAMES
#define WORKAROUND_EXCEPTION_PROBLEM
-//_______________________________________________
-// includes
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index d83036135f58..11b2265c8e38 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -29,9 +29,6 @@
#ifndef __FILTER_CONFIG_FILTERCACHE_HXX_
#define __FILTER_CONFIG_FILTERCACHE_HXX_
-//_______________________________________________
-// includes
-
#include "cacheitem.hxx"
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/util/URL.hpp>
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 30c25d642145..bcd0a70dbdf2 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -32,8 +32,6 @@
#include "constant.hxx"
#include "versions.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/enumhelper.hxx>
#include <comphelper/configurationhelper.hxx>
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index f9c72b13aa2c..7dd9f34629b6 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -20,9 +20,6 @@
#ifndef __FILTER_CONFIG_FILTERFACTORY_HXX_
#define __FILTER_CONFIG_FILTERFACTORY_HXX_
-//_______________________________________________
-// includes
-
#include "basecontainer.hxx"
#include "querytokenizer.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 3eb99bbfd4ed..38f15cec445c 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -32,8 +32,6 @@
#include "constant.hxx"
#include "versions.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/enumhelper.hxx>
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index eb5e62b2b269..391ad347e37a 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -20,9 +20,6 @@
#ifndef __FILTER_CONFIG_FRAMELOADERFACTORY_HXX_
#define __FILTER_CONFIG_FRAMELOADERFACTORY_HXX_
-//_______________________________________________
-// includes
-
#include "basecontainer.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx
index f856b424cbe0..22c5a1c255a4 100644
--- a/filter/source/config/cache/lateinitlistener.hxx
+++ b/filter/source/config/cache/lateinitlistener.hxx
@@ -20,9 +20,6 @@
#ifndef __FILTER_CONFIG_LATEINITLISTENER_HXX_
#define __FILTER_CONFIG_LATEINITLISTENER_HXX_
-//_______________________________________________
-// includes
-
#include "cacheitem.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx
index 273b4d425652..86839a3892c8 100644
--- a/filter/source/config/cache/querytokenizer.cxx
+++ b/filter/source/config/cache/querytokenizer.cxx
@@ -29,10 +29,6 @@
#include "querytokenizer.hxx"
-//_______________________________________________
-// includes
-
-//_______________________________________________
// namespace
namespace filter{
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index c3cbbdb58b05..ee8d7ad0be30 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -29,9 +29,6 @@
#ifndef _FILTER_CONFIG_QUERYTOKENIZER_HXX_
#define _FILTER_CONFIG_QUERYTOKENIZER_HXX_
-//_______________________________________________
-// includes
-
#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 8e3747cb7aa6..aa22089539fc 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -29,8 +29,6 @@
#include "typedetection.hxx"
#include "constant.hxx"
-//_______________________________________________
-// includes
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index c55d0c42b930..ad0ef61906bb 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -28,9 +28,6 @@
#ifndef __FILTER_CONFIG_TYPEDETECTION_HXX_
#define __FILTER_CONFIG_TYPEDETECTION_HXX_
-//_______________________________________________
-// includes
-
#include "basecontainer.hxx"
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 8ce67e4df169..3ef7791778ac 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star {
namespace xsd { class XDataType; }
} } }
-// includes for parent classes
#include <cppuhelper/implbase8.hxx>
#include <propertysetbase.hxx>
#include <com/sun/star/form/binding/XValueBinding.hpp>
@@ -63,7 +62,6 @@ namespace com { namespace sun { namespace star {
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-// includes for member variables
#include "pathexpression.hxx"
#include "boolexpression.hxx"
#include "mip.hxx"
diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx
index fdadc44b0119..f9bff076a5ae 100644
--- a/forms/source/xforms/boolexpression.hxx
+++ b/forms/source/xforms/boolexpression.hxx
@@ -20,7 +20,6 @@
#ifndef _BOOLEXPRESSION_HXX
#define _BOOLEXPRESSION_HXX
-// include for parent class
#include "computedexpression.hxx"
namespace xforms
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 528bda5e457f..6a0adb4b0a62 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -29,8 +29,6 @@
#ifndef _COMPUTEDEXPRESSION_HXX
#define _COMPUTEDEXPRESSION_HXX
-
-// includes for member variables
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 30fd2855fc08..609e6c296536 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -29,8 +29,6 @@
#ifndef _MODEL_HXX
#define _MODEL_HXX
-
-// include for parent class(es)
#include <cppuhelper/implbase4.hxx>
#include <propertysetbase.hxx>
#include <com/sun/star/xforms/XModel.hpp>
@@ -38,8 +36,6 @@
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-
-// includes for member variables
#include <com/sun/star/uno/Reference.hxx>
#include <map>
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index ce7b12821b25..ddfc5362b030 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -20,11 +20,8 @@
#ifndef _PATHEXPRESSION_HXX
#define _PATHEXPRESSION_HXX
-
-// include for parent class
#include "computedexpression.hxx"
-// includes for member variables
#include <vector>
// forward declaractions
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index eb2b9e613741..0c16b82b79ad 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -28,8 +28,6 @@
#ifndef _PROPERTYSETBASE_HXX
#define _PROPERTYSETBASE_HXX
-
-// include for parent class
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <comphelper/propstate.hxx>
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index 15c89d2be1dd..3a94aa98fff7 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -20,8 +20,6 @@
#ifndef _SUBMISSION_HXX
#define _SUBMISSION_HXX
-
-// includes for parent classes
#include <cppuhelper/implbase2.hxx>
#include <propertysetbase.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
@@ -34,7 +32,6 @@
#include <com/sun/star/xml/xpath/XXPathObject.hpp>
#include <com/sun/star/xforms/XSubmission.hpp>
-// includes for member variables
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <computedexpression.hxx>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 75ab873ecbee..63fcb86ffc19 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -20,10 +20,6 @@
#ifndef _SALAQUAFILEPICKER_HXX_
#define _SALAQUAFILEPICKER_HXX_
-//_______________________________________________________________________________________________________________________
-// includes of other projects
-//_______________________________________________________________________________________________________________________
-
#include <cppuhelper/compbase8.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 66c35369e8d9..fc7562b7d3c9 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index aa478c5e6711..f66d88dfc981 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -20,10 +20,6 @@
#ifndef _SALAQUAFOLDERPICKER_HXX_
#define _SALAQUAFOLDERPICKER_HXX_
-//_______________________________________________________________________________________________________________________
-// includes of other projects
-//_______________________________________________________________________________________________________________________
-
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 5cd380d2bfa0..6496e12d2673 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index 319001b6ff5a..72425f2b8b0d 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -20,10 +20,6 @@
#ifndef _SALAQUAFPICKER_HXX_
#define _SALAQUAFPICKER_HXX_
-//_____________________________________________________________________________
-// includes of other projects
-//_____________________________________________________________________________
-
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index d2825d6de22f..9fdc8486a38f 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/interfacecontainer.h>
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 8172f9cf6fc5..4fdb6adc1256 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -21,10 +21,6 @@
#ifndef _RESOURCEPROVIDER_HXX_
#define _RESOURCEPROVIDER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <premac.h>
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index bf585b9b1392..f0a1df8fef78 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 64f5d3af5c08..f795421f0ea6 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -16,7 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // includes ******************************************************************
#include "svtools/helpid.hrc"
#include "svtools/svtools.hrc"
#include "iodlg.hrc"
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 69b18c224388..532edcfbf086 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//----------------------------------------------
-// includes of other projects
-//----------------------------------------------
#include <cppuhelper/factory.hxx>
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 8215818733ed..6397a2561274 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -22,11 +22,6 @@
#endif
#define _WIN32_WINNT 0x0500
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include <osl/diagnose.h>
#include "../misc/WinImplHelper.hxx"
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index d3c812a8e27f..bd335b73ccd1 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -20,10 +20,6 @@
#ifndef _FILEOPENDLG_HXX_
#define _FILEOPENDLG_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2b87f3a0f5c5..f7828100f761 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.h>
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 363aacc4565b..4e84d4821277 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -20,11 +20,6 @@
#ifndef _FILEPICKER_HXX_
#define _FILEPICKER_HXX_
-//_______________________________________________________________________________________________________________________
-// includes of other projects
-//_______________________________________________________________________________________________________________________
-
-
#include <cppuhelper/compbase10.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 5af47b0262eb..98724d45fa19 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
#define FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#include "comptr.hxx"
#include "vistatypes.h"
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 6983bd1c9f29..c09c13c14c74 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include "PreviewCtrl.hxx"
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index 6a6be5b316c6..d543bb07971d 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -20,10 +20,6 @@
#ifndef _PREVIEWCTRL_HXX_
#define _PREVIEWCTRL_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index a0013a3d7a9f..aeec19768bea 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#ifdef _MSC_VER
#pragma warning (disable:4917)
#endif
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 94befc920eb1..206dbdc2dd2a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_FILEPICKER_HXX
#define FPICKER_WIN32_VISTA_FILEPICKER_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#include "asyncrequests.hxx"
#include "VistaFilePickerImpl.hxx"
#include "VistaFilePickerEventHandler.hxx"
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index e3ca2bbcb2d4..eaf4f949ff79 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
#define FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#pragma warning( disable : 4917 )
#endif
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index eb390928e61c..faf010bbc967 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#include "VistaFilePickerImpl.hxx"
// Without IFileDialogCustomize we can't do much
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 1d5dc4f11793..1d5ef1a4e559 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
#define FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#pragma warning( disable : 4917 )
#endif
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index a0c7d2476832..b8361f1fb1a7 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include "shared.hxx"
#include "WinFileOpenImpl.hxx"
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 641e79076e62..c3d7a0bdcfe3 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -21,10 +21,6 @@
#ifndef _WINFILEOPENIMPL_HXX_
#define _WINFILEOPENIMPL_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 69a2ba72130e..035e29915593 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "asynceventnotifier.hxx"
#include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index 62f1f3780e2a..a15bcfdf0282 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -20,10 +20,6 @@
#ifndef _ASYNCEVENTNOTIFIER_HXX_
#define _ASYNCEVENTNOTIFIER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <cppuhelper/interfacecontainer.h>
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 87923fca5c5a..50067779a17c 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
#define FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#include <cppuhelper/basemutex.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <osl/conditn.hxx>
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index 8cb1ec9b5919..e9e5bc289f6a 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include <sal/macros.h>
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index 0cc5fe3c37b6..a0a47ee78b39 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -21,10 +21,6 @@
#ifndef _CONTROLACCESS_HXX_
#define _CONTROLACCESS_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index 0732be132edd..e68093d23723 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "controlcommand.hxx"
#include "controlcommandrequest.hxx"
#include "controlcommandresult.hxx"
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index adfd3ff72995..2c7ae2fd2363 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -20,10 +20,6 @@
#ifndef _CONTROLCOMMAND_HXX_
#define _CONTROLCOMMAND_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index cc1eaa147bd4..4f53edd06fa3 100644
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
@@ -20,10 +20,6 @@
#ifndef _CONTROLCOMMANDREQUEST_HXX_
#define _CONTROLCOMMANDREQUEST_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
//---------------------------------------------
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 94411e1930f4..983dd784cee3 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -20,10 +20,6 @@
#ifndef _CONTROLCOMMANDRESULT_HXX_
#define _CONTROLCOMMANDRESULT_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index abbdc98b94e7..fdaae96ee131 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include "dibpreview.hxx"
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 73be6a27b3af..e63a3c8ad392 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -20,10 +20,6 @@
#ifndef _DIBPREVIEW_HXX_
#define _DIBPREVIEW_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include "previewbase.hxx"
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index ff1fbcaa4336..f4cac5049e31 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <boost/scoped_ptr.hpp>
#include "filepickerstate.hxx"
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 638be57fb6f9..5a250e2db4e0 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -20,10 +20,6 @@
#ifndef _FILEPICKERSTATE_HXX_
#define _FILEPICKERSTATE_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include "controlcommand.hxx"
#include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 5dc2d9c851a2..4a8eb9e8bfca 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <stdio.h>
#include <osl/diagnose.h>
#include "getfilenamewrapper.hxx"
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 19c5e72950ff..2ec0e4da597b 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -20,10 +20,6 @@
#ifndef _GETFILENAMEWRAPPER_HXX_
#define _GETFILENAMEWRAPPER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#define WIN32_LEAN_AND_MEAN
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 4bf12e2ff4f7..af7449d9e1e0 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <tchar.h>
#include "helppopupwindow.hxx"
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 77317d26627b..3e565c2f59cc 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -20,10 +20,6 @@
#ifndef _HELPPOPUPWINDOW_HXX_
#define _HELPPOPUPWINDOW_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index 6fc832bfa975..97cff510f34b 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -20,10 +20,6 @@
#ifndef FPICKER_WIN32_VISTA_TYPES_HXX
#define FPICKER_WIN32_VISTA_TYPES_HXX
-//-----------------------------------------------------------------------------
-// includes
-//-----------------------------------------------------------------------------
-
#include "comptr.hxx"
#include <shobjidl.h>
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index f1df053c9c0a..7a3eca82f13d 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -17,18 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-//_________________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________________
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <osl/file.hxx>
-//_________________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________________
#include <cppuhelper/servicefactory.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index 501ca591442e..42ae1d225132 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -22,10 +22,6 @@
#define _FOPSERVICEINFO_HXX_
//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
// defines
//------------------------------------------------------------------------
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index a0cf667c8903..a7e8f90a5369 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include "FolderPicker.hxx"
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 9b5acc4c9c42..a795f5fbfd71 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -20,10 +20,6 @@
#ifndef _FOLDERPICKER_HXX_
#define _FOLDERPICKER_HXX_
-//---------------------------------------------------------
-// includes of other projects
-//---------------------------------------------------------
-
#include <cppuhelper/implbase3.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index cf6d7980236f..1576eb1cbc8d 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include "WinFOPImpl.hxx"
#include <osl/diagnose.h>
#include <com/sun/star/lang/EventObject.hpp>
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 01baae54be6d..8d362b4abc81 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -21,11 +21,6 @@
#ifndef _WINFOPIMPL_HXX_
#define _WINFOPIMPL_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include "MtaFop.hxx"
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 667d2a443b10..50f3ce521dea 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -17,18 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-//-----------------------------------------------------------
-// interface includes
-//-----------------------------------------------------------
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <osl/file.hxx>
-//--------------------------------------------------------------
-// other includes
-//--------------------------------------------------------------
#include <cppuhelper/servicefactory.hxx>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index 747f4214cc6f..43e4bceba3e1 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include "AutoBuffer.hxx"
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/misc/AutoBuffer.hxx b/fpicker/source/win32/misc/AutoBuffer.hxx
index a4bfc6008f99..e11357db05ef 100644
--- a/fpicker/source/win32/misc/AutoBuffer.hxx
+++ b/fpicker/source/win32/misc/AutoBuffer.hxx
@@ -20,10 +20,6 @@
#ifndef _AUTO_BUFFER_HXX_
#define _AUTO_BUFFER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index d42db7a86e33..93c9244227b5 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include "AutoBuffer.hxx"
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 27ca03ad6ea1..41557b24f2f7 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -21,10 +21,6 @@
#ifndef _WINIMPLHELPER_HXX_
#define _WINIMPLHELPER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 0581e65ae8d5..0fce57830ea5 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include "resourceprovider.hxx"
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 3356e53b7c2d..dbd1c2e84062 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -21,10 +21,6 @@
#ifndef _RESOURCEPROVIDER_HXX_
#define _RESOURCEPROVIDER_HXX_
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 04a0a53cf135..eea40b7d76cd 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -17,18 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//_________________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <osl/file.hxx>
-//_________________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________________
#include <cppuhelper/servicefactory.hxx>
#ifndef _RTL_USTRING_
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
-//_________________________________________________________