summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--animations/source/animcore/factreg.hxx4
-rw-r--r--avmedia/inc/mediacontrol.hxx4
-rw-r--r--avmedia/source/framework/soundhandler.hxx6
-rw-r--r--avmedia/source/gstreamer/gstcommon.hxx4
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx6
-rw-r--r--avmedia/source/gstreamer/gstmanager.hxx6
-rw-r--r--avmedia/source/gstreamer/gstplayer.hxx6
-rw-r--r--avmedia/source/gstreamer/gstwindow.hxx6
-rw-r--r--avmedia/source/inc/mediamisc.hxx4
-rw-r--r--avmedia/source/opengl/oglframegrabber.hxx6
-rw-r--r--avmedia/source/opengl/oglmanager.hxx6
-rw-r--r--avmedia/source/opengl/oglplayer.hxx6
-rw-r--r--avmedia/source/opengl/oglwindow.hxx6
-rw-r--r--avmedia/source/quicktime/framegrabber.hxx6
-rw-r--r--avmedia/source/quicktime/manager.hxx6
-rw-r--r--avmedia/source/quicktime/player.hxx6
-rw-r--r--avmedia/source/quicktime/quicktimecommon.hxx6
-rw-r--r--avmedia/source/quicktime/window.hxx6
-rw-r--r--avmedia/source/viewer/mediaevent_impl.hxx4
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx4
-rw-r--r--avmedia/source/vlc/vlccommon.hxx4
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx6
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx4
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx4
-rw-r--r--avmedia/source/vlc/vlcwindow.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/Common.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/EventHandler.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/EventManager.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/Instance.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/Media.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/Player.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/SymbolLoader.hxx4
-rw-r--r--avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/Types.hxx6
-rw-r--r--avmedia/source/win/framegrabber.hxx6
-rw-r--r--avmedia/source/win/interface.hxx4
-rw-r--r--avmedia/source/win/manager.hxx6
-rw-r--r--avmedia/source/win/player.hxx6
-rw-r--r--avmedia/source/win/wincommon.hxx4
-rw-r--r--avmedia/source/win/window.hxx6
-rw-r--r--basegfx/source/inc/hommatrixtemplate.hxx6
-rw-r--r--basegfx/source/inc/stringconversiontools.hxx6
-rw-r--r--basegfx/source/workbench/bezierclip.hxx6
-rw-r--r--bridges/inc/bridges/cpp_uno/bridge.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/bridge.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/types.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx4
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/vtables.hxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/share.hxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx6
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx6
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx4
-rw-r--r--bridges/source/cpp_uno/mingw_x86-64/abi.hxx6
-rw-r--r--bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx4
-rw-r--r--bridges/source/jni_uno/jni_base.h4
-rw-r--r--bridges/source/jni_uno/jni_helper.h4
-rw-r--r--bridges/source/jni_uno/jni_info.h4
-rw-r--r--chart2/inc/ChartModel.hxx4
-rw-r--r--chart2/inc/ChartView.hxx4
-rw-r--r--chart2/inc/unonames.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx4
-rw-r--r--chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_PropertyMapping.hxx4
-rw-r--r--chart2/source/controller/inc/res_LegendPosition.hxx4
-rw-r--r--chart2/source/controller/inc/res_Titles.hxx4
-rw-r--r--chart2/source/inc/GL3DHelper.hxx4
-rw-r--r--chart2/source/inc/RegressionCalculationHelper.hxx6
-rw-r--r--chart2/source/model/template/GL3DBarChartType.hxx4
-rw-r--r--chart2/source/model/template/GL3DBarChartTypeTemplate.hxx4
-rw-r--r--chart2/source/view/charttypes/NetChart.hxx4
-rw-r--r--chart2/source/view/inc/GL3DBarChart.hxx4
-rw-r--r--chart2/source/view/inc/GL3DPlotterBase.hxx4
-rw-r--r--chart2/source/view/inc/GL3DRenderer.hxx4
-rw-r--r--chart2/source/view/inc/StaticGeometry.h4
-rw-r--r--chart2/source/view/main/DummyXShape.hxx4
-rw-r--r--cli_ure/source/uno_bridge/cli_base.h4
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.h4
-rw-r--r--cli_ure/source/uno_bridge/cli_environment.h4
-rw-r--r--cli_ure/source/uno_bridge/cli_proxy.h4
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx6
-rw-r--r--connectivity/source/inc/java/util/Property.hxx6
-rw-r--r--cppcanvas/source/inc/action.hxx6
-rw-r--r--cppcanvas/source/inc/canvasgraphichelper.hxx6
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx6
-rw-r--r--cppcanvas/source/inc/outdevstate.hxx6
-rw-r--r--cppcanvas/source/inc/tools.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/lineaction.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/mtftools.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.hxx6
-rw-r--r--cppcanvas/source/uno/uno_mtfrenderer.hxx4
-rw-r--r--cppcanvas/source/wrapper/implbitmap.hxx6
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx6
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx6
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx6
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx6
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx6
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx6
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx6
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx6
-rw-r--r--crashrep/source/win32/base64.h6
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx4
-rw-r--r--dtrans/source/cnttype/mcnttfactory.hxx4
-rw-r--r--dtrans/source/cnttype/mcnttype.hxx4
-rw-r--r--dtrans/source/generic/clipboardmanager.hxx4
-rw-r--r--dtrans/source/generic/generic_clipboard.hxx4
-rw-r--r--dtrans/source/inc/DtObjFactory.hxx4
-rw-r--r--dtrans/source/win32/clipb/APNDataObject.hxx4
-rw-r--r--dtrans/source/win32/clipb/MtaOleClipb.hxx4
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx4
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.hxx4
-rw-r--r--dtrans/source/win32/dnd/globals.hxx4
-rw-r--r--dtrans/source/win32/dnd/idroptarget.hxx4
-rw-r--r--dtrans/source/win32/dnd/source.hxx4
-rw-r--r--dtrans/source/win32/dnd/sourcecontext.hxx4
-rw-r--r--dtrans/source/win32/dnd/target.hxx4
-rw-r--r--dtrans/source/win32/dnd/targetdragcontext.hxx4
-rw-r--r--dtrans/source/win32/dnd/targetdropcontext.hxx4
-rw-r--r--dtrans/source/win32/dtobj/APNDataObject.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx4
-rw-r--r--dtrans/source/win32/dtobj/Fetc.hxx4
-rw-r--r--dtrans/source/win32/dtobj/FetcList.hxx4
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.hxx4
-rw-r--r--dtrans/source/win32/dtobj/MimeAttrib.hxx4
-rw-r--r--dtrans/source/win32/dtobj/TxtCnvtHlp.hxx4
-rw-r--r--dtrans/source/win32/dtobj/XNotifyingDataObject.hxx4
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.hxx4
-rw-r--r--dtrans/source/win32/ftransl/ftransl.hxx4
-rw-r--r--dtrans/source/win32/misc/ImplHelper.hxx4
-rw-r--r--dtrans/source/win32/misc/WinClip.hxx4
-rw-r--r--dtrans/source/win32/workbench/XTDo.hxx4
-rw-r--r--dtrans/test/win32/dnd/atlwindow.hxx4
-rw-r--r--dtrans/test/win32/dnd/sourcelistener.hxx4
-rw-r--r--dtrans/test/win32/dnd/targetlistener.hxx4
-rw-r--r--dtrans/test/win32/dnd/transferable.hxx4
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx4
-rw-r--r--embeddedobj/source/inc/dummyobject.hxx4
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx4
-rw-r--r--embeddedobj/source/inc/specialobject.hxx4
-rw-r--r--embeddedobj/source/msole/olecomponent.hxx4
-rw-r--r--embeddedobj/source/msole/ownview.hxx4
-rw-r--r--embeddedobj/source/msole/platform.h4
-rw-r--r--embeddedobj/test/mtexecutor/bitmapcreator.hxx4
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.hxx4
-rw-r--r--embedserv/source/inc/common.h4
-rw-r--r--embedserv/source/inc/embeddoc.hxx6
-rw-r--r--embedserv/source/inc/embeddocaccess.hxx4
-rw-r--r--embedserv/source/inc/embservconst.h4
-rw-r--r--embedserv/source/inc/iipaobj.hxx4
-rw-r--r--embedserv/source/inc/servprov.hxx4
-rw-r--r--embedserv/source/inc/xwin.hxx4
-rw-r--r--embedserv/source/inprocserv/inprocembobj.h4
-rw-r--r--embedserv/source/inprocserv/smartpointer.hxx4
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx4
-rw-r--r--fpicker/source/aqua/AquaFilePickerDelegate.hxx4
-rw-r--r--fpicker/source/aqua/CFStringUtilities.hxx6
-rw-r--r--fpicker/source/aqua/ControlHelper.hxx6
-rw-r--r--fpicker/source/aqua/FPServiceInfo.hxx4
-rw-r--r--fpicker/source/aqua/FilterHelper.hxx6
-rw-r--r--fpicker/source/aqua/NSString_OOoAdditions.hxx6
-rw-r--r--fpicker/source/aqua/NSURL_OOoAdditions.hxx4
-rw-r--r--fpicker/source/aqua/SalAquaConstants.h6
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.hxx6
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.hxx6
-rw-r--r--fpicker/source/aqua/SalAquaPicker.hxx4
-rw-r--r--fpicker/source/aqua/resourceprovider.hxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.hxx6
-rw-r--r--fpicker/source/office/OfficeFilePicker.hxx6
-rw-r--r--fpicker/source/office/OfficeFolderPicker.hxx6
-rw-r--r--fpicker/source/office/PlacesListBox.hxx4
-rw-r--r--fpicker/source/office/QueryFolderName.hxx6
-rw-r--r--fpicker/source/office/asyncfilepicker.hxx6
-rw-r--r--fpicker/source/office/commonpicker.hxx6
-rw-r--r--fpicker/source/office/fpinteraction.hxx6
-rw-r--r--fpicker/source/office/fpsmartcontent.hxx6
-rw-r--r--fpicker/source/office/fpsofficeResMgr.hxx4
-rw-r--r--fpicker/source/office/iodlg.hxx6
-rw-r--r--fpicker/source/office/iodlgimp.hxx6
-rw-r--r--fpicker/source/office/pickercallbacks.hxx6
-rw-r--r--fpicker/source/win32/filepicker/FPServiceInfo.hxx4
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.hxx4
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.hxx4
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.hxx4
-rw-r--r--fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx6
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.hxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx6
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.hxx4
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.hxx6
-rw-r--r--fpicker/source/win32/filepicker/comptr.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlaccess.hxx4
-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/customcontrol.hxx4
-rw-r--r--fpicker/source/win32/filepicker/customcontrolcontainer.hxx4
-rw-r--r--fpicker/source/win32/filepicker/customcontrolfactory.hxx4
-rw-r--r--fpicker/source/win32/filepicker/dialogcustomcontrols.hxx4
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.hxx4
-rw-r--r--fpicker/source/win32/filepicker/eventnotification.hxx4
-rw-r--r--fpicker/source/win32/filepicker/filepickereventnotification.hxx4
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.hxx4
-rw-r--r--fpicker/source/win32/filepicker/getfilenamewrapper.hxx4
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.hxx4
-rw-r--r--fpicker/source/win32/filepicker/platform_vista.h4
-rw-r--r--fpicker/source/win32/filepicker/platform_xp.h4
-rw-r--r--fpicker/source/win32/filepicker/previewadapter.hxx4
-rw-r--r--fpicker/source/win32/filepicker/previewbase.hxx4
-rw-r--r--fpicker/source/win32/filepicker/shared.hxx4
-rw-r--r--fpicker/source/win32/filepicker/vistatypes.h6
-rw-r--r--fpicker/source/win32/folderpicker/FOPServiceInfo.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/FopEvtDisp.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.hxx4
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.hxx4
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.hxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.hxx4
-rw-r--r--framework/inc/interaction/quietinteraction.hxx2
-rw-r--r--framework/inc/uifactory/configurationaccessfactorymanager.hxx6
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--i18npool/inc/breakiteratorImpl.hxx6
-rw-r--r--i18npool/inc/breakiterator_cjk.hxx6
-rw-r--r--i18npool/inc/breakiterator_ctl.hxx4
-rw-r--r--i18npool/inc/breakiterator_th.hxx6
-rw-r--r--i18npool/inc/breakiterator_unicode.hxx4
-rw-r--r--i18npool/inc/calendarImpl.hxx4
-rw-r--r--i18npool/inc/calendar_gregorian.hxx4
-rw-r--r--i18npool/inc/calendar_hijri.hxx4
-rw-r--r--i18npool/inc/calendar_jewish.hxx4
-rw-r--r--i18npool/inc/cclass_unicode.hxx4
-rw-r--r--i18npool/inc/chaptercollator.hxx4
-rw-r--r--i18npool/inc/characterclassificationImpl.hxx4
-rw-r--r--i18npool/inc/collatorImpl.hxx4
-rw-r--r--i18npool/inc/collator_unicode.hxx4
-rw-r--r--i18npool/inc/defaultnumberingprovider.hxx4
-rw-r--r--i18npool/inc/indexentrysupplier.hxx4
-rw-r--r--i18npool/inc/indexentrysupplier_asian.hxx4
-rw-r--r--i18npool/inc/indexentrysupplier_common.hxx4
-rw-r--r--i18npool/inc/indexentrysupplier_default.hxx4
-rw-r--r--i18npool/inc/indexentrysupplier_ja_phonetic.hxx4
-rw-r--r--i18npool/inc/inputsequencechecker.hxx6
-rw-r--r--i18npool/inc/inputsequencechecker_hi.hxx4
-rw-r--r--i18npool/inc/inputsequencechecker_th.hxx6
-rw-r--r--i18npool/inc/localedata.hxx6
-rw-r--r--i18npool/inc/nativenumbersupplier.hxx4
-rw-r--r--i18npool/inc/numberformatcode.hxx6
-rw-r--r--i18npool/inc/servicename.hxx4
-rw-r--r--i18npool/inc/textToPronounce_zh.hxx4
-rw-r--r--i18npool/inc/textconversion.hxx4
-rw-r--r--i18npool/inc/textconversionImpl.hxx4
-rw-r--r--i18npool/inc/transliterationImpl.hxx4
-rw-r--r--i18npool/inc/transliteration_Ignore.hxx6
-rw-r--r--i18npool/inc/transliteration_Numeric.hxx6
-rw-r--r--i18npool/inc/transliteration_OneToOne.hxx6
-rw-r--r--i18npool/inc/transliteration_body.hxx4
-rw-r--r--i18npool/inc/transliteration_caseignore.hxx4
-rw-r--r--i18npool/inc/transliteration_commonclass.hxx6
-rw-r--r--i18npool/inc/unoscripttypedetector.hxx4
-rw-r--r--i18npool/inc/wtt.h6
-rw-r--r--i18npool/inc/xdictionary.hxx4
-rw-r--r--i18npool/source/localedata/LocaleNode.hxx4
-rw-r--r--i18npool/source/search/levdis.hxx4
-rw-r--r--i18npool/source/search/textsearch.hxx4
-rw-r--r--i18nutil/source/utility/casefolding_data.h4
-rw-r--r--i18nutil/source/utility/unicode_data.h4
-rw-r--r--i18nutil/source/utility/widthfolding_data.h4
-rw-r--r--idl/inc/hash.hxx2
-rw-r--r--include/comphelper/scoped_disposing_ptr.hxx4
-rw-r--r--include/svl/svldllapi.h6
-rw-r--r--include/systools/win32/comptr.hxx4
-rw-r--r--include/systools/win32/snprintf.h6
-rw-r--r--include/test/htmltesttools.hxx4
-rw-r--r--include/test/xmltesttools.hxx4
-rw-r--r--include/vbahelper/vbadllapi.h2
-rw-r--r--include/vcl/oldprintadaptor.hxx4
-rw-r--r--include/vcl/outdevmap.hxx6
-rw-r--r--include/vcl/outdevstate.hxx6
-rw-r--r--include/wntgcci/jni_md.h6
-rw-r--r--include/wntgcci/sehandler.hxx6
-rw-r--r--include/wntgccx/jni_md.h6
-rw-r--r--include/wntgccx/sehandler.hxx6
-rw-r--r--include/xmloff/unointerfacetouniqueidentifiermapper.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx4
-rw-r--r--jvmfwk/source/elements.hxx4
-rw-r--r--jvmfwk/source/framework.hxx4
-rw-r--r--jvmfwk/source/fwkbase.hxx4
-rw-r--r--jvmfwk/source/fwkutil.hxx4
-rw-r--r--jvmfwk/source/libxmlutil.hxx4
-rw-r--r--l10ntools/inc/xrmlex.hxx4
-rw-r--r--o3tl/qa/cow_wrapper_clients.hxx6
-rw-r--r--oox/inc/services.hxx4
-rw-r--r--pyuno/inc/pyuno/pyuno.hxx4
-rw-r--r--pyuno/source/module/pyuno_impl.hxx4
-rw-r--r--registry/source/keyimpl.hxx4
-rw-r--r--registry/source/reflcnst.hxx4
-rw-r--r--registry/source/regimpl.hxx4
-rw-r--r--registry/test/regdiagnose.h6
-rw-r--r--rsc/inc/rscall.h6
-rw-r--r--rsc/inc/rscarray.hxx4
-rw-r--r--rsc/inc/rscclass.hxx6
-rw-r--r--rsc/inc/rscclobj.hxx6
-rw-r--r--rsc/inc/rscconst.hxx6
-rw-r--r--rsc/inc/rsccont.hxx6
-rw-r--r--rsc/inc/rscdb.hxx4
-rw-r--r--rsc/inc/rscdef.hxx6
-rw-r--r--rsc/inc/rscerror.h6
-rw-r--r--rsc/inc/rscflag.hxx6
-rw-r--r--rsc/inc/rschash.hxx6
-rw-r--r--rsc/inc/rsckey.hxx6
-rw-r--r--rsc/inc/rscmgr.hxx6
-rw-r--r--rsc/inc/rscpar.hxx6
-rw-r--r--rsc/inc/rscrange.hxx6
-rw-r--r--rsc/inc/rscrsc.hxx6
-rw-r--r--rsc/inc/rscstr.hxx6
-rw-r--r--rsc/inc/rsctools.hxx6
-rw-r--r--rsc/inc/rsctop.hxx6
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/source/parser/rsclex.cxx2
-rw-r--r--sal/android/uthash.h6
-rw-r--r--sal/inc/internal/oslmemory.h4
-rw-r--r--sal/inc/internal/rtllifecycle.h4
-rw-r--r--sal/osl/unx/file_error_transl.h4
-rw-r--r--sal/osl/unx/file_impl.hxx6
-rw-r--r--sal/osl/unx/file_path_helper.h4
-rw-r--r--sal/osl/unx/file_path_helper.hxx4
-rw-r--r--sal/osl/unx/file_url.h6
-rw-r--r--sal/osl/unx/system.h6
-rw-r--r--sal/osl/unx/uunxapi.h6
-rw-r--r--sal/osl/unx/uunxapi.hxx6
-rw-r--r--sal/osl/w32/file_error.h6
-rw-r--r--sal/osl/w32/file_url.h6
-rw-r--r--sal/osl/w32/path_helper.h4
-rw-r--r--sal/osl/w32/path_helper.hxx4
-rw-r--r--sal/qa/OStringBuffer/rtl_String_Const.h6
-rw-r--r--sal/qa/OStringBuffer/rtl_String_Utils_Const.h6
-rw-r--r--sal/qa/inc/stringhelper.hxx4
-rw-r--r--sal/qa/osl/condition/osl_Condition_Const.h6
-rw-r--r--sal/qa/osl/file/osl_File_Const.h6
-rw-r--r--sal/qa/osl/module/osl_Module_Const.h6
-rw-r--r--sal/qa/osl/mutex/osl_Mutex_Const.h6
-rw-r--r--sal/qa/osl/security/osl_Security_Const.h6
-rw-r--r--sal/qa/osl/socket/sockethelper.hxx4
-rw-r--r--sal/qa/rtl/process/rtl_Process_Const.h4
-rw-r--r--sal/rtl/alloc_arena.hxx6
-rw-r--r--sal/rtl/alloc_cache.hxx6
-rw-r--r--sal/rtl/alloc_impl.hxx6
-rw-r--r--sal/rtl/hash.hxx6
-rw-r--r--sal/rtl/strimp.hxx6
-rw-r--r--sal/rtl/surrogates.hxx4
-rw-r--r--sal/workben/clipboardwben/testcopy/XTDataObject.hxx4
-rw-r--r--salhelper/test/rtti/samplelibrtti.hxx4
-rw-r--r--sax/source/expatwrap/attrlistimpl.hxx4
-rw-r--r--sax/source/tools/fastserializer.hxx4
-rw-r--r--sc/source/ui/inc/FTestDialog.hxx4
-rw-r--r--sccomp/source/solver/SolverComponent.hxx4
-rw-r--r--sd/source/ui/inc/createcustomanimationpanel.hxx4
-rw-r--r--setup_native/source/win32/customactions/tools/seterror.hxx4
-rw-r--r--setup_native/source/win32/wintools/makecab/parseddf.h6
-rw-r--r--sfx2/inc/sidebar/ContextChangeBroadcaster.hxx4
-rw-r--r--sfx2/inc/sidebar/PopupContainer.hxx4
-rw-r--r--sfx2/source/appl/helpdispatch.hxx2
-rw-r--r--sfx2/source/inc/macroloader.hxx4
-rw-r--r--shell/source/backends/localebe/localebackend.hxx6
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.hxx6
-rw-r--r--soltools/cpp/_getopt.h4
-rw-r--r--soltools/mkdepend/collectdircontent.hxx4
-rw-r--r--stoc/source/corereflection/lrucache.hxx4
-rw-r--r--stoc/source/javavm/interact.hxx6
-rw-r--r--stoc/source/javavm/javavm.hxx6
-rw-r--r--stoc/source/javavm/jvmargs.hxx4
-rw-r--r--stoc/source/security/lru_cache.h4
-rw-r--r--stoc/source/security/permissions.h4
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.hxx4
-rw-r--r--stoc/source/uriproc/UriReference.hxx4
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.hxx4
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svgcharacternode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgcirclenode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgclippathnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgdocument.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgdocumenthandler.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgellipsenode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svggnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svggradientnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svggradientstopnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgimagenode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svglinenode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgmarkernode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgmasknode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgpaint.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgpathnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgpatternnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgpolynode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgrectnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgstyleattributes.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgstylenode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgsvgnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgsymbolnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtextnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtextpathnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtitledescnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtoken.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtools.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtrefnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtspannode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgusenode.hxx6
-rw-r--r--svtools/inc/roadmap.hxx4
-rw-r--r--svtools/inc/table/defaultinputhandler.hxx6
-rw-r--r--svtools/inc/table/gridtablerenderer.hxx6
-rw-r--r--svtools/inc/table/tablecontrol.hxx6
-rw-r--r--svtools/inc/table/tablecontrolinterface.hxx6
-rw-r--r--svtools/inc/vclxaccessibleheaderbar.hxx6
-rw-r--r--svtools/inc/vclxaccessibleheaderbaritem.hxx6
-rw-r--r--svtools/source/inc/hatchwindow.hxx6
-rw-r--r--svtools/source/inc/hatchwindowfactory.hxx4
-rw-r--r--svx/inc/AccessibleTableShape.hxx4
-rw-r--r--svx/inc/polygn3d.hxx6
-rw-r--r--svx/inc/sdr/attribute/sdrfilltextattribute.hxx6
-rw-r--r--svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx6
-rw-r--r--svx/inc/sdr/contact/objectcontactofpageview.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofe3dcube.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofe3dextrude.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofe3dlathe.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofe3dsphere.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofgraphic.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofgroup.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofopenglobj.hxx4
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrpage.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewcontactofunocontrol.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofe3d.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofgroup.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx6
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlaycrosshair.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlayhatchrect.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlayhelpline.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlayline.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlayrectangle.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlayrollingrectangle.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlaytools.hxx6
-rw-r--r--svx/inc/sdr/overlay/overlaytriangle.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrprimitivetools.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx6
-rw-r--r--svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx6
-rw-r--r--svx/inc/sdr/properties/captionproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/circleproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/connectorproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/customshapeproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/e3dextrudeproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/e3dlatheproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/e3dsceneproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/e3dsphereproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/graphicproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/groupproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/itemsettools.hxx6
-rw-r--r--svx/inc/sdr/properties/measureproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/oleproperties.hxx6
-rw-r--r--svx/inc/sdr/properties/pageproperties.hxx6
-rw-r--r--svx/inc/svdglob.hxx6
-rw-r--r--svx/inc/svdoopengl.hxx4
-rw-r--r--svx/inc/sxallitm.hxx4
-rw-r--r--svx/inc/sxcikitm.hxx4
-rw-r--r--svx/inc/sxlayitm.hxx4
-rw-r--r--svx/inc/sxlogitm.hxx4
-rw-r--r--svx/inc/sxmkitm.hxx4
-rw-r--r--svx/inc/sxmoitm.hxx4
-rw-r--r--svx/inc/sxmovitm.hxx4
-rw-r--r--svx/inc/sxmsitm.hxx4
-rw-r--r--svx/inc/sxmtaitm.hxx4
-rw-r--r--svx/inc/sxoneitm.hxx4
-rw-r--r--svx/inc/sxonitm.hxx4
-rw-r--r--svx/inc/sxopitm.hxx4
-rw-r--r--svx/inc/sxraitm.hxx4
-rw-r--r--svx/inc/sxreaitm.hxx4
-rw-r--r--svx/inc/sxreoitm.hxx4
-rw-r--r--svx/inc/sxroaitm.hxx4
-rw-r--r--svx/inc/sxrooitm.hxx4
-rw-r--r--svx/inc/sxsaitm.hxx4
-rw-r--r--svx/inc/sxsalitm.hxx4
-rw-r--r--svx/inc/sxsoitm.hxx4
-rw-r--r--svx/inc/sxtraitm.hxx4
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx1
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx4
-rw-r--r--svx/source/sidebar/ColorPanel.hxx4
-rw-r--r--svx/source/sidebar/debug/ColorPanel.hxx4
-rw-r--r--sw/source/core/inc/DocumentSettingManager.hxx4
-rw-r--r--testtools/source/bridgetest/multi.hxx4
-rw-r--r--toolkit/inc/helper/accessibilityclient.hxx6
-rw-r--r--toolkit/inc/helper/imagealign.hxx6
-rw-r--r--toolkit/inc/helper/tkresmgr.hxx6
-rw-r--r--toolkit/inc/helper/unopropertyarrayhelper.hxx6
-rw-r--r--toolkit/inc/helper/unowrapper.hxx6
-rw-r--r--tools/inc/poly.h4
-rw-r--r--ucb/source/cacher/dynamicresultsetwrapper.hxx3
-rw-r--r--ucb/source/ucp/webdav-neon/ContentProperties.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVAuthListener.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/DAVException.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVProperties.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResource.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSession.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVTypes.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DateTimeHelper.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/LinkSequence.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/LockEntrySequence.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/LockSequence.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonInputStream.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonLockStore.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonTypes.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/PropertyMap.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavresultset.hxx4
-rw-r--r--ucb/source/ucp/webdav/AprEnv.hxx6
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVAuthListener.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx4
-rw-r--r--ucb/source/ucp/webdav/DAVException.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVRequestEnvironment.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVResource.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVSession.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVTypes.hxx6
-rw-r--r--ucb/source/ucp/webdav/DateTimeHelper.hxx4
-rw-r--r--ucb/source/ucp/webdav/PropertyMap.hxx4
-rw-r--r--ucb/source/ucp/webdav/SerfCallbacks.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfInputStream.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfLockStore.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfSession.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfUri.hxx6
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx6
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.hxx4
-rw-r--r--ucb/source/ucp/webdav/webdavdatasupplier.hxx4
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.hxx4
-rw-r--r--ucb/source/ucp/webdav/webdavresponseparser.hxx6
-rw-r--r--ucb/source/ucp/webdav/webdavresultset.hxx4
-rw-r--r--vcl/generic/glyphs/scrptrun.h4
-rw-r--r--vcl/generic/print/prtsetup.hxx4
-rw-r--r--vcl/inc/quartz/salvd.h6
-rw-r--r--vcl/inc/unx/XIM.h4
-rw-r--r--vcl/inc/unx/gtk/hudawareness.h6
-rw-r--r--vcl/inc/unx/tde/tdedata.hxx6
-rw-r--r--vcl/osx/OSXTransferable.hxx4
-rw-r--r--vcl/source/filter/jpeg/JpegTransform.hxx2
-rw-r--r--vcl/source/filter/jpeg/jpeg.hxx6
-rw-r--r--vcl/unx/gtk/fpicker/eventnotification.hxx4
-rw-r--r--vcl/unx/kde/FPServiceInfo.hxx4
-rw-r--r--winaccessibility/inc/UAccCOMdllapi.h4
-rw-r--r--xmlscript/source/inc/misc.hxx4
-rw-r--r--xmlscript/source/inc/xml_import.hxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/common.hxx4
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.hxx6
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.hxx6
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx6
625 files changed, 1555 insertions, 1561 deletions
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
index 9d503de61ffb..24e9c98fdc4d 100644
--- a/animations/source/animcore/factreg.hxx
+++ b/animations/source/animcore/factreg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INCLUDED_ANIMCORE_FACTREG_HXX_
-#define _INCLUDED_ANIMCORE_FACTREG_HXX_
+#ifndef INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
+#define INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
namespace animcore {
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index c22513722c73..2e0f20b9b8d6 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_MEDIACONTROL_HXX
-#define _AVMEDIA_MEDIACONTROL_HXX
+#ifndef INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
+#define INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
#include <avmedia/mediaitem.hxx>
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index e6dddf91783d..d41c033cb226 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
-#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#ifndef INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -136,6 +136,6 @@ class SoundHandler : // interfaces
} // namespace avmedia
-#endif // #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#endif // INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 7d535666f418..20ae74882be5 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GSTCOMMON_HXX
-#define _GSTCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
#include <gst/gst.h>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 6d89af62b339..87a3f2369078 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
#include "gstplayer.hxx"
#include <com/sun/star/media/XFrameGrabber.hpp>
@@ -59,6 +59,6 @@ private:
} // namespace gst
} // namespace avmedia
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index e0283d196488..507ee7d82a28 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
#include "gstcommon.hxx"
@@ -53,6 +53,6 @@ private:
} // namespace gstreamer
} // namespace avmedia
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 23f325d8a37a..f31dcb85f49a 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
#include <osl/conditn.hxx>
#include "gstcommon.hxx"
@@ -104,6 +104,6 @@ protected:
} // namespace gstreamer
} // namespace avmedia
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index df45af121a23..659c4fc556c3 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
#include "gstcommon.hxx"
#include <cppuhelper/interfacecontainer.h>
@@ -96,6 +96,6 @@ private:
} // namespace gstreamer
} // namespace avmedia
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 19d5edc7ecac..6a86cfb93786 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_MEDIAMISC_HXX
-#define _AVMEDIA_MEDIAMISC_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
+#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
class ResMgr;
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index b4b1daee7326..5be63714cbbe 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef OGL_FRAMEGRABBER_HXX
-#define OGL_FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,6 +43,6 @@ private:
} // namespace ogl
} // namespace avmedia
-#endif // OGL_FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index bbecfbcb0391..cb4ec2112634 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef OGL_MANAGER_HXX
-#define OGL_MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -39,6 +39,6 @@ private:
} // namespace ogl
} // namespace avmedia
-#endif // OGL_MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
index 1f1efce2440d..86e8a6efee69 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef OGL_PLAYER_HXX
-#define OGL_PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -63,6 +63,6 @@ private:
} // namespace ogl
} // namespace avmedia
-#endif // OGL_PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index ba510e46f31c..2b1c9436e242 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef OGL_WINDOW_HXX
-#define OGL_WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
#include "oglplayer.hxx"
@@ -76,6 +76,6 @@ private:
} // namespace ogl
} // namespace avmedia
-#endif // OGL_WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0552af4cb1ef..cb7021532328 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
#include "quicktimecommon.hxx"
@@ -60,6 +60,6 @@ private:
} // namespace quicktime
} // namespace avmedia
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index af64284a900e..b5d1b02b9a39 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
#include "quicktimecommon.hxx"
@@ -53,6 +53,6 @@ private:
} // namespace quicktime
} // namespace avmedia
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 69cbcdd9f55a..3c308ca9a7ec 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
#include <osl/conditn.h>
#include "quicktimecommon.hxx"
@@ -86,6 +86,6 @@ private:
} // namespace quicktime
} // namespace avmedia
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 91785b889ea3..397a716ef2c6 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _QUICKTIMECOMMON_HXX
-#define _QUICKTIMECOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
#ifdef MACOSX
#include <premac.h>
@@ -28,9 +28,7 @@
#include <postmac.h>
#endif
#include <osl/mutex.hxx>
-#ifndef __RTL_USTRING_
#include <rtl/ustring.hxx>
-#endif
#include <tools/stream.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 3a47e30657b7..bb96470aaefb 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
#include "quicktimecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
@@ -102,6 +102,6 @@ private:
} // namespace quicktime
} // namespace avmedia
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 6817df65df34..9f551bd2ea51 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_MEDIAEVENT_IMPL_HXX
-#define _AVMEDIA_MEDIAEVENT_IMPL_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
#include <avmedia/mediawindow.hxx>
#include <cppuhelper/compbase4.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index a5e8215d0d90..c1ba15c52cc1 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_MEDIAWINDOW_IMPL_HXX
-#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
#include <svtools/transfer.hxx>
#include <vcl/syschild.hxx>
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index 1bc9fa169b10..b99325b59c16 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VLCCOMMON_HXX
-#define _VLCCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 11ce48f3b299..d51485c57978 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VLCFRAMEGRABBER_HXX
-#define _VLCFRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
#include <boost/shared_ptr.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp>
@@ -55,4 +55,4 @@ public:
}
}
-#endif // _VLCFRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 948464f8c871..36eebceb9e2c 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VLCMANAGER_HXX
-#define _VLCMANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/media/XManager.hpp>
#include "vlccommon.hxx"
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index effb5b2270d2..455d5875e687 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VLCPLAYER_HXX
-#define _VLCPLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
#include "vlccommon.hxx"
#include <boost/shared_ptr.hpp>
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index c907edb1c141..a34c0bfd96b4 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VLCWINDOW_HXX
-#define _VLCWINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
#include "vlccommon.hxx"
@@ -71,4 +71,4 @@ public:
}
}
-#endif // _VLCWINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
diff --git a/avmedia/source/vlc/wrapper/Common.hxx b/avmedia/source/vlc/wrapper/Common.hxx
index 9cdffcc213a4..f4984b6b1482 100644
--- a/avmedia/source/vlc/wrapper/Common.hxx
+++ b/avmedia/source/vlc/wrapper/Common.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_COMMON_HXX
-#define _WRAPPER_COMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
namespace avmedia
{
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index 82c6efcdb5d9..37272c2ea2ad 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_EVENT_HANDLER_HXX
-#define _WRAPPER_EVENT_HANDLER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
#include <salhelper/thread.hxx>
@@ -37,6 +37,6 @@ namespace wrapper
}
}
-#endif // _WRAPPER_EVENT_HANDLER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx
index b29aea360273..8ee2eb6fe17f 100644
--- a/avmedia/source/vlc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/wrapper/EventManager.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_EVENT_MANAGER_HXX
-#define _WRAPPER_EVENT_MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx
index 0432bf14c9c6..76d800bd497a 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/wrapper/Instance.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_INSTANCE_HXX
-#define _WRAPPER_INSTANCE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
struct libvlc_instance_t;
diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx
index 0cdadf0d33c9..cf1d4e719ca7 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/wrapper/Media.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_MEDIA_HXX
-#define _WRAPPER_MEDIA_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
struct libvlc_media_t;
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index 77e45914f2b6..018c5ebce5ec 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _WRAPPER_PLAYER_HXX
-#define _WRAPPER_PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
#if defined UNX
# include <stdint.h>
#endif
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index e7db7a7cdbb6..2426dea706dc 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _SYMBOL_LOADER_HXX
-#define _SYMBOL_LOADER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
#if defined( WNT )
# include <windows.h>
# include <winreg.h>
diff --git a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
index f2868a388294..b37158c31bb0 100644
--- a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
+++ b/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _THREADSAFE_QUEUE_HXX
-#define _THREADSAFE_QUEUE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
#include <queue>
#include <iostream>
#include <osl/mutex.hxx>
@@ -77,5 +77,5 @@ void ThreadsafeQueue<T>::pop( T& data )
}
}
-#endif // _THREADSAFE_QUEUE_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/avmedia/source/vlc/wrapper/Types.hxx b/avmedia/source/vlc/wrapper/Types.hxx
index 06a0674c06da..913aa2b8f147 100644
--- a/avmedia/source/vlc/wrapper/Types.hxx
+++ b/avmedia/source/vlc/wrapper/Types.hxx
@@ -2,8 +2,8 @@
/* Typedefs and structures that represent the libvlc API / ABI */
-#ifndef _WRAPPER_TYPES_HXX
-#define _WRAPPER_TYPES_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
#if defined WNT
typedef __int64 libvlc_time_t;
@@ -46,6 +46,6 @@ struct libvlc_track_description_t
}
-#endif // _WRAPPER_TYPES_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 809d1df0f734..841da8f97f8a 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
#include "wincommon.hxx"
@@ -61,6 +61,6 @@ private:
} // namespace win
} // namespace avmedia
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index 0a713fbcd696..f954872ffa86 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AVMEDIA_INTERFACE_HXX
-#define _AVMEDIA_INTERFACE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
extern "C" const CLSID CLSID_MediaDet;
extern "C" const IID IID_IMediaDet;
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 24854b9a76c4..9bd7f25ab48f 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
#include "wincommon.hxx"
@@ -53,6 +53,6 @@ private:
} // namespace win
} // namespace avmedia
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 8d3035d6ff76..b2e861df6811 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
#include "wincommon.hxx"
@@ -118,6 +118,6 @@ private:
} // namespace win
} // namespace avmedia
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index e2b8673268ad..8f4c8a923e92 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINCOMMON_HXX
-#define _WINCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index afa7361c1414..f0f82b5b0136 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
#include "wincommon.hxx"
#include <cppuhelper/interfacecontainer.h>
@@ -110,6 +110,6 @@ private:
} // namespace win
} // namespace avmedia
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 6342677c5216..93c14f2bd4db 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HOMMATRIX_TEMPLATE_HXX
-#define _HOMMATRIX_TEMPLATE_HXX
+#ifndef INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX
+#define INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX
#include <sal/types.h>
#include <basegfx/numeric/ftools.hxx>
@@ -602,6 +602,6 @@ namespace basegfx
} // namespace internal
} // namespace basegfx
-#endif /* _HOMMATRIX_TEMPLATE_HXX */
+#endif // INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/inc/stringconversiontools.hxx b/basegfx/source/inc/stringconversiontools.hxx
index 96692dcf2bb4..834c0de0465f 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _STRINGCONVERSIONTOOLS_HXX
-#define _STRINGCONVERSIONTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
+#define INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -91,6 +91,6 @@ namespace basegfx
} // namespace internal
} // namespace basegfx
-#endif /* _STRINGCONVERSIONTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/workbench/bezierclip.hxx b/basegfx/source/workbench/bezierclip.hxx
index b95beaaf3612..bb9153be3680 100644
--- a/basegfx/source/workbench/bezierclip.hxx
+++ b/basegfx/source/workbench/bezierclip.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef BASEGFX_BEZIERCLIP_HXX
-#define BASEGFX_BEZIERCLIP_HXX
+#ifndef INCLUDED_BASEGFX_SOURCE_WORKBENCH_BEZIERCLIP_HXX
+#define INCLUDED_BASEGFX_SOURCE_WORKBENCH_BEZIERCLIP_HXX
#include <vector>
@@ -82,6 +82,6 @@ template <typename NumType> bool tolEqual( NumType n1, NumType n2 ) { return tol
template <typename NumType> bool tolLessEqual( NumType n1, NumType n2 ) { return tolEqual(n1,n2) || n1<n2; }
template <typename NumType> bool tolGreaterEqual( NumType n1, NumType n2 ) { return tolEqual(n1,n2) || n1>n2; }
-#endif /* BASEGFX_BEZIERCLIP_HXX */
+#endif // INCLUDED_BASEGFX_SOURCE_WORKBENCH_BEZIERCLIP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 5c72815e6727..8eb1a723a236 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
-#define _BRIDGES_CPP_UNO_BRIDGE_HXX_
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_BRIDGE_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_BRIDGE_HXX
#include <bridges/cpp_uno/bridge.h>
#include <osl/mutex.hxx>
diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
index f88e2a3b5d22..c5018c32b967 100644
--- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
#include "sal/config.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
index 3ee36daa2933..ba086598479e 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
#include "osl/interlck.h"
#include "sal/types.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
index f363444f19c8..f6e50a9e9bbc 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
#include "osl/interlck.h"
#include "rtl/ustring.hxx"
diff --git a/bridges/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/bridges/cpp_uno/shared/types.hxx
index 47011da1aba1..d5ecd5eb2c25 100644
--- a/bridges/inc/bridges/cpp_uno/shared/types.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/types.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
#include "typelib/typeclass.h"
#include "typelib/typedescription.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
index 7e2846ac6e71..7fac67110847 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
#include "osl/interlck.h"
#include "rtl/ustring.hxx"
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 38f8b7ec14bc..7ff0e3492173 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
#include "osl/mutex.hxx"
#include "rtl/alloc.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
index de39963116ce..ee9a2a3deea2 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
-#define INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
#include "sal/types.h"
#include "typelib/typedescription.h"
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 1a270118e296..6622ba4c548e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ARM_SHARE_HXX
-#define _ARM_SHARE_HXX
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ARM_SHARE_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ARM_SHARE_HXX
#include "uno/mapping.h"
#include <typeinfo>
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
index fda4cd8fcae5..25d618331b06 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HKK
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HKK
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HXX
#include "uno/mapping.h"
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index 93981247978a..915d45b2fc54 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
-#define _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
// This is an implementation of the x86-64 ABI as described in 'System V
// Application Binary Interface, AMD64 Architecture Processor Supplement'
@@ -56,6 +56,6 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
} // namespace x86_64
-#endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#endif // INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
index 93981247978a..90aad264c89d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
-#define _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
// This is an implementation of the x86-64 ABI as described in 'System V
// Application Binary Interface, AMD64 Architecture Processor Supplement'
@@ -56,6 +56,6 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
} // namespace x86_64
-#endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#endif // INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
index cfea6ab40c41..ddd0493dc6c4 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX
#include "sal/config.h"
diff --git a/bridges/source/cpp_uno/mingw_x86-64/abi.hxx b/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
index 93981247978a..09d2c97c9f2e 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
-#define _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MINGW_X86_64_ABI_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MINGW_X86_64_ABI_HXX
// This is an implementation of the x86-64 ABI as described in 'System V
// Application Binary Interface, AMD64 Architecture Processor Supplement'
@@ -56,6 +56,6 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
} // namespace x86_64
-#endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+#endif // INCLUDED_BRIDGES_SOURCE_CPP_UNO_MINGW_X86_64_ABI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx
index cfea6ab40c41..a7c25b3e517f 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MINGW_X86_64_CALLVIRTUALMETHOD_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MINGW_X86_64_CALLVIRTUALMETHOD_HXX
#include "sal/config.h"
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 3f44316d7978..163530437fd9 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JNI_BASE_H
-#define INCLUDED_JNI_BASE_H
+#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BASE_H
+#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BASE_H
#include <sal/config.h>
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index fda0dc13d137..ce16b6c587f2 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JNI_HELPER_H
-#define INCLUDED_JNI_HELPER_H
+#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_HELPER_H
+#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_HELPER_H
#include <o3tl/heap_ptr.hxx>
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 10263b202abf..2f1019195bfb 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JNI_INFO_H
-#define INCLUDED_JNI_INFO_H
+#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
+#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
#include <boost/unordered_map.hpp>
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 6ea16fd25d06..9fb24fef2414 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_CHARTMODEL_HXX
-#define INCLUDED_CHART2_SOURCE_MODEL_MAIN_CHARTMODEL_HXX
+#ifndef INCLUDED_CHART2_INC_CHARTMODEL_HXX
+#define INCLUDED_CHART2_INC_CHARTMODEL_HXX
#include "LifeTime.hxx"
#include "ServiceMacros.hxx"
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 69f1eedf3313..156bf8a93e87 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_CHARTVIEW_HXX
-#define INCLUDED_CHART2_SOURCE_VIEW_MAIN_CHARTVIEW_HXX
+#ifndef INCLUDED_CHART2_INC_CHARTVIEW_HXX
+#define INCLUDED_CHART2_INC_CHARTVIEW_HXX
#include "ChartModel.hxx"
#include "chartview/ExplicitValueProvider.hxx"
diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 9f9d1cb3cd45..7962249120ce 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_UNONAMES_HXX
-#define CHART2_UNONAMES_HXX
+#ifndef INCLUDED_CHART2_INC_UNONAMES_HXX
+#define INCLUDED_CHART2_INC_UNONAMES_HXX
#define CHART_UNONAME_SORT_BY_XVALUES "SortByXValues"
#define CHART_UNONAME_ROUNDED_EDGE "RoundedEdge"
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
index 90034a0f5dd7..7671151bdff6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_WRAPPEDGL3DPROPERTIES_HXX
-#define CHART2_WRAPPEDGL3DPROPERTIES_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
#include <vector>
#include <boost/shared_ptr.hpp>
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
index 19b603d2bc11..70eea08e2dd6 100644
--- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
-#define INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX
#include "ChartTypeDialogController.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
index 35dc8dee02d8..0358a84dbfe2 100644
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
+++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_PROPERTY_MAPPING_HXX
-#define CHART2_PROPERTY_MAPPING_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index 3a739ce65ea7..c8292db200af 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
#include <vcl/builder.hxx>
#include <vcl/button.hxx>
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index dbfb065ee910..fe78e75b92c2 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TITLES_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TITLES_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX
#include "TitleDialogData.hxx"
#include <vcl/builder.hxx>
diff --git a/chart2/source/inc/GL3DHelper.hxx b/chart2/source/inc/GL3DHelper.hxx
index d7e2464d3c6c..637710515cc9 100644
--- a/chart2/source/inc/GL3DHelper.hxx
+++ b/chart2/source/inc/GL3DHelper.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_GL3DHELPER_HXX
-#define CHART2_GL3DHELPER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_INC_GL3DHELPER_HXX
+#define INCLUDED_CHART2_SOURCE_INC_GL3DHELPER_HXX
#include <charttoolsdllapi.hxx>
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 523108bebc54..1970c563d3ad 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
-#define INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
+#define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
#include <rtl/math.hxx>
@@ -117,7 +117,7 @@ public:
} // namespace RegressionCalculationHelper
} // namespace chart
-// INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
+// INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index aa5ab6b52de4..f60ba4ac9bbb 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CHART2_GL3DBARCHARTTYPE_HXX
-#define INCLUDED_CHART2_GL3DBARCHARTTYPE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX
+#define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX
#include "ChartType.hxx"
#include "ServiceMacros.hxx"
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index 50a21d7a7dd7..f2957536e8c4 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_GL3DBARCHARTTYPETEMPLATE_HXX
-#define CHART2_GL3DBARCHARTTYPETEMPLATE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPETEMPLATE_HXX
+#define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPETEMPLATE_HXX
#include <MutexContainer.hxx>
#include <ChartTypeTemplate.hxx>
diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx
index 6f3e42b89669..fd11c6dedd20 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHART2_NETCHART_HXX
-#define _CHART2_NETCHART_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_NETCHART_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_NETCHART_HXX
#include "VSeriesPlotter.hxx"
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index 81e7639a6896..bd09caa0eaf9 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_GL3DBARCHART_HXX
-#define CHART2_GL3DBARCHART_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DBARCHART_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DBARCHART_HXX
#include <GL3DPlotterBase.hxx>
diff --git a/chart2/source/view/inc/GL3DPlotterBase.hxx b/chart2/source/view/inc/GL3DPlotterBase.hxx
index cd69bf2eccd9..ceea643e8854 100644
--- a/chart2/source/view/inc/GL3DPlotterBase.hxx
+++ b/chart2/source/view/inc/GL3DPlotterBase.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_GL3DPLOTTERBASE_HXX
-#define CHART2_GL3DPLOTTERBASE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX
#include <boost/ptr_container/ptr_vector.hpp>
#include "VDataSeries.hxx"
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 83008e6c7f83..8628bb8db724 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_GL3DRENDERER_HXX
-#define CHART2_GL3DRENDERER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DRENDERER_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DRENDERER_HXX
#include "glm/glm.hpp"
#include "glm/gtx/transform.hpp"
diff --git a/chart2/source/view/inc/StaticGeometry.h b/chart2/source/view/inc/StaticGeometry.h
index bdc8fe74a26a..3ff412a3a753 100644
--- a/chart2/source/view/inc/StaticGeometry.h
+++ b/chart2/source/view/inc/StaticGeometry.h
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CHART2_STATIC_GEOMETRY_H
-#define INCLUDED_CHART2_STATIC_GEOMETRY_H
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_STATICGEOMETRY_H
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_STATICGEOMETRY_H
#define TOP_SURFACE 0
#define MIDDLE_SURFACE 1
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index c96165b02112..11aa9fa27cea 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CHART2_DUMMY_XSHAPE_HXX
-#define CHART2_DUMMY_XSHAPE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_DUMMYXSHAPE_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_MAIN_DUMMYXSHAPE_HXX
#include <cppuhelper/implbase6.hxx>
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index e70e8c1f067d..284d44f09106 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CLI_BASE_H
-#define INCLUDED_CLI_BASE_H
+#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_BASE_H
+#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_BASE_H
#pragma unmanaged
// Workaround: osl/mutex.h contains only a forward declaration of _oslMutexImpls.
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 88cb11832e2b..1b14cd87165f 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CLI_BRIDGE_H
-#define INCLUDED_CLI_BRIDGE_H
+#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_BRIDGE_H
+#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_BRIDGE_H
#include <vcclr.h>
#include "osl/interlck.h"
#include "uno/mapping.h"
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index e53e18121dd9..0a0b251aa452 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CLI_ENVIRONMENT_H
-#define INCLUDED_CLI_ENVIRONMENT_H
+#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_ENVIRONMENT_H
+#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_ENVIRONMENT_H
#include "cli_base.h"
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 77823f8c08ae..093b674dfc64 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CLI_PROXY_H
-#define INCLUDED_CLI_PROXY_H
+#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
+#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
#pragma warning(push, 1)
#include "uno/environment.hxx"
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 82d2c4544507..6f5f622cfc17 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
-#define _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSET_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSET_HXX
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
@@ -211,6 +211,6 @@ namespace connectivity
}
}
-#endif // _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index 191c250fa434..923848d8f6d4 100644
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CONNECTIVITY_java_util_Properties_HXX
-#define CONNECTIVITY_java_util_Properties_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_PROPERTY_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_PROPERTY_HXX
#include "java/lang/Object.hxx"
@@ -38,6 +38,6 @@ namespace connectivity
};
}
-#endif // CONNECTIVITY_java_util_Properties_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_PROPERTY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index 3beaa8ce2b05..c47bb29e6c20 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_ACTION_HXX
-#define _CPPCANVAS_ACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
#include <sal/types.h>
@@ -151,6 +151,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_ACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index ec607aed8169..e408e490aba4 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_CANVASGRAPHICHELPER_HXX
-#define _CPPCANVAS_CANVASGRAPHICHELPER_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
#include <com/sun/star/rendering/RenderState.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -73,6 +73,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_CANVASGRAPHICHELPER_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 9048c446d3c7..76a86c882dce 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLRENDERER_HXX
-#define _CPPCANVAS_IMPLRENDERER_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
#include <sal/types.h>
@@ -348,6 +348,6 @@ static float GetSwapFloat( SvStream& rSt )
}
}
-#endif /* _CPPCANVAS_IMPLRENDERER_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 26e10263a369..d1e8c1f837e9 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_OUTDEVSTATE_HXX
-#define _CPPCANVAS_OUTDEVSTATE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -121,6 +121,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_OUTDEVSTATE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index f1d60ed8b159..b55f2c8582c1 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_TOOLS_HXX
-#define _CPPCANVAS_TOOLS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -45,6 +45,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_TOOLS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index f96074795f37..f2439da8966e 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_BITMAPACTION_HXX
-#define _CPPCANVAS_BITMAPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
#include <cppcanvas/canvas.hxx>
#include <action.hxx>
@@ -70,6 +70,6 @@ namespace cppcanvas
}
}
-#endif /*_CPPCANVAS_BITMAPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 5a86f5af804d..f6377d5645f0 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
-#define _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
@@ -84,6 +84,6 @@ namespace cppcanvas
}
}
-#endif /*_CPPCANVAS_CACHEDPRIMITIVEBASE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 101c598c32a1..a755c5964aed 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_LINEACTION_HXX
-#define _CPPCANVAS_LINEACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
#include <action.hxx>
#include <cppcanvas/canvas.hxx>
@@ -62,6 +62,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_LINEACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 323b11e432e7..42e1db34128d 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_RENDERER_MTFTOOLS_HXX
-#define _CPPCANVAS_RENDERER_MTFTOOLS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
#include <action.hxx>
#include <cppcanvas/canvas.hxx>
@@ -202,6 +202,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_RENDERER_MTFTOOLS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 1487cfe65b9a..f71ea9eaf8bf 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_POINTACTION_HXX
-#define _CPPCANVAS_POINTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
#include <action.hxx>
#include <cppcanvas/canvas.hxx>
@@ -67,6 +67,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_POINTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 47c4e91c204c..a81e8738bb06 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_POLYPOLYACTION_HXX
-#define _CPPCANVAS_POLYPOLYACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
#include <action.hxx>
#include <cppcanvas/canvas.hxx>
@@ -90,6 +90,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_POLYPOLYACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index f40f03ee6787..7afe47aeba01 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_TEXTACTION_HXX
-#define _CPPCANVAS_TEXTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
#include <com/sun/star/uno/Sequence.hxx>
@@ -90,6 +90,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_TEXTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 221864dbb3f1..21937485dcd4 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
-#define _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/renderer.hxx>
@@ -101,6 +101,6 @@ namespace cppcanvas
}
}
-#endif /*_CPPCANVAS_TRANSPARENCYGROUPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index 64d8f4d1bbf9..821cf4fbcb51 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _UNO_MTF_RENDERER_HXX_
-#define _UNO_MTF_RENDERER_HXX_
+#ifndef INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
#include <com/sun/star/rendering/MtfRenderer.hpp>
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index a446079f340d..e4b387ea51f6 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLBITMAP_HXX
-#define _CPPCANVAS_IMPLBITMAP_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XBitmap.hpp>
@@ -67,6 +67,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLBITMAP_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 5a96a3835df1..bae2541ce59f 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX
-#define _CPPCANVAS_IMPLBITMAPCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
@@ -59,6 +59,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLBITMAPCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 63de9d4f87f1..8a6401f1c69a 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLCANVAS_HXX
-#define _CPPCANVAS_IMPLCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/ViewState.hpp>
@@ -89,6 +89,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 69ac454e8c3a..2d5e0310eb10 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLCOLOR_HXX
-#define _CPPCANVAS_IMPLCOLOR_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
#include <com/sun/star/uno/Sequence.hxx>
@@ -51,6 +51,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLCOLOR_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index f3e5dff0e571..19187de4620e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
-#define _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
#include <sal/types.h>
@@ -58,6 +58,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLCUSTOMSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index c754ab1449e0..227e7da83f99 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLFONT_HXX
-#define _CPPCANVAS_IMPLFONT_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
#include <com/sun/star/uno/Reference.hxx>
@@ -64,6 +64,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLFONT_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index fdfc19d548b9..b685bdcf7706 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CANVAS_IMPLPOLYPOLYGON_HXX
-#define _CANVAS_IMPLPOLYPOLYGON_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
@@ -82,6 +82,6 @@ namespace cppcanvas
}
}
-#endif /* _CANVAS_IMPLPOLYPOLYGON_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 290fe9548831..8cb9d8fa9f39 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLSPRITE_HXX
-#define _CPPCANVAS_IMPLSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
@@ -73,6 +73,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 60cd52e2563e..8a0223e1bee7 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CPPCANVAS_IMPLSPRITECANVAS_HXX
-#define _CPPCANVAS_IMPLSPRITECANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <basegfx/vector/b2dsize.hxx>
@@ -89,6 +89,6 @@ namespace cppcanvas
}
}
-#endif /* _CPPCANVAS_IMPLSPRITECANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/crashrep/source/win32/base64.h b/crashrep/source/win32/base64.h
index 3d1e7c998748..5f6c26e1902c 100644
--- a/crashrep/source/win32/base64.h
+++ b/crashrep/source/win32/base64.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __BASE64_H
-#define __BASE64_H
+#ifndef INCLUDED_CRASHREP_SOURCE_WIN32_BASE64_H
+#define INCLUDED_CRASHREP_SOURCE_WIN32_BASE64_H
#ifndef _INC_STDIO
#include <stdio.h>
@@ -33,6 +33,6 @@ size_t base64_encode( FILE *fin, FILE *fout );
}
#endif
-#endif /* __BASE64_H */
+#endif // INCLUDED_CRASHREP_SOURCE_WIN32_BASE64_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 43a60f394b0d..f0a53f38b0b6 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVX_SPELL_ATTRIB
-#define _SVX_SPELL_ATTRIB
+#ifndef INCLUDED_CUI_SOURCE_DIALOGS_SPELLATTRIB_HXX
+#define INCLUDED_CUI_SOURCE_DIALOGS_SPELLATTRIB_HXX
#include <vcl/txtattr.hxx>
#include <i18nlangtag/lang.h>
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 7bd42adea6a8..19bf5501bc4a 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MCNTTFACTORY_HXX_
-#define _MCNTTFACTORY_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
+#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 0ebb192989b7..4812bc5b64ee 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MCNTTYPE_HXX_
-#define _MCNTTYPE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
+#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
#include <cppuhelper/compbase1.hxx>
#include <rtl/ustring.hxx>
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 090f7597c3c7..89c8845e2b9b 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_CLIPBOARDMANAGER_HXX_
-#define _DTRANS_CLIPBOARDMANAGER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
+#define INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
#include <cppuhelper/compbase3.hxx>
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index a6853ce29379..0d937171cca0 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_GENERIC_CLIPBOARD_HXX_
-#define _DTRANS_GENERIC_CLIPBOARD_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
+#define INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
#include <cppuhelper/compbase4.hxx>
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index 0031dc5d7cc3..23ca93e25206 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTOBJFACTORY_HXX_
-#define _DTOBJFACTORY_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
+#define INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index 740bd5508595..fbfbdb4ca45d 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _APNDATAOBJECT_HXX_
-#define _APNDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
/*
an APartment Neutral dataobject wrapper; this wrapper of a IDataObject
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index e3ebfd2a1b3c..a8458a1c3fec 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MTAOLECLIPB_HXX_
-#define _MTAOLECLIPB_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
#include <sal/types.h>
#include <osl/mutex.hxx>
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index bb496df082fa..e248dad499b4 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINCLIPBIMPL_HXX_
-#define _WINCLIPBIMPL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 36344799719f..8e6f66271645 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINCLIPBOARD_HXX_
-#define _WINCLIPBOARD_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index e614e50962b6..a6214e95a168 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GLOBALS_HXX_
-#define _GLOBALS_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
#include <osl/mutex.hxx>
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index bbaa799b147b..19f797443ac0 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IDROPTARGET_HXX_
-#define _IDROPTARGET_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
#include "target.hxx"
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 333fc7b61106..1cbf840b5ecd 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SOURCE_HXX_
-#define _SOURCE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index f149abb5e556..3682ea2a9840 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SOURCECONTEXT_HXX_
-#define _SOURCECONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 6216213eedbb..708f21a7e6d3 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TARGET_HXX_
-#define _TARGET_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 26029c86681b..8e0ad473e33e 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TARGETDRAGCONTEXT_HXX_
-#define _TARGETDRAGCONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index 6f428c89b080..4b945737cc7b 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TARGETDROPCONTEXT_HXX_
-#define _TARGETDROPCONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index bc23d88d6c8c..9522aae05129 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _APNDATAOBJECT_HXX_
-#define _APNDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
#include <systools/win32/comtools.hxx>
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 5e20010949d5..3090439f5228 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOTRANSFERABLE_HXX_
-#define _DOTRANSFERABLE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 7c9424f34026..308331efabbe 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANSHELPER_HXX_
-#define _DTRANSHELPER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index fb024d869347..12c105431b0f 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DATAFMTTRANSL_HXX_
-#define _DATAFMTTRANSL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
#include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 7358b9a3ef61..4f86c691bc94 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FETC_HXX_
-#define _FETC_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
#include <sal/types.h>
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index cab9b02782e8..97ee1ed9b67c 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FETCLIST_HXX_
-#define _FETCLIST_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
#include <sal/types.h>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 8020662adb3b..8ee93a2935c2 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FMTFILTER_HXX_
-#define _FMTFILTER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
#include <sal/types.h>
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index 278f2aa36323..eb57ba750ea1 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MIMEATTRIB_HXX_
-#define _MIMEATTRIB_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
#include <rtl/ustring.hxx>
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index 8f3b2a02ace0..e2fe22835cb4 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TXTCNVTHLP_HXX_
-#define _TXTCNVTHLP_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
#include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 43d94f1f6b4d..fbe45cb91b36 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XNOTIFYINGDATAOBJECT_HXX_
-#define _XNOTIFYINGDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 6e1b1c21f25d..9577cb5143c5 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index b7913097720e..6bf5ec2dd18b 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FTRANSL_HXX_
-#define _FTRANSL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index de50bd8f94ff..e612744e8763 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IMPLHELPER_HXX_
-#define _IMPLHELPER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
#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 5689a7bf294d..268c7a0392a6 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/win32/misc/WinClip.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINCLIP_HXX_
-#define _WINCLIP_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
#include <sal/types.h>
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 6d4891419269..213534439e0d 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx b/dtrans/test/win32/dnd/atlwindow.hxx
index 63756578539d..0dbb0f5d879c 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINDOW_HXX_
-#define _WINDOW_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
#include <atlbase.h>
extern CComModule _Module;
#include <atlcom.h>
diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx
index 07d3294a61aa..72b1b9aa28af 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/dtrans/test/win32/dnd/sourcelistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SOURCELISTENER_HXX_
-#define _SOURCELISTENER_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index da14fad93411..a70a669fb3b9 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TARGETLISTENER_HXX_
-#define _TARGETLISTENER_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
#if defined _MSC_VER
#pragma warning(push,1)
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index 49fba2719ac5..96688ddbf166 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TRANSFERABLE_HXX_
-#define _TRANSFERABLE_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 10a9de957afc..98354f3eabf4 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INC_COMMONEMBOBJ_HXX_
-#define _INC_COMMONEMBOBJ_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_COMMONEMBOBJ_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_COMMONEMBOBJ_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 4e490a0ca54d..aeef1e09ec21 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INC_DUMMYOBJECT_HXX_
-#define _INC_DUMMYOBJECT_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DUMMYOBJECT_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_DUMMYOBJECT_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 4b4c148bd9cc..42152742a0c4 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INC_OLEEMBOBJ_HXX_
-#define _INC_OLEEMBOBJ_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_OLEEMBOBJ_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_OLEEMBOBJ_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index f04f69432570..fa34f17cc041 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INC_SPECIALOBJECT_HXX_
-#define _INC_SPECIALOBJECT_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_SPECIALOBJECT_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_SPECIALOBJECT_HXX
#include <com/sun/star/awt/Size.hpp>
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 12389885eb14..a152f63d9cb0 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INC_OLECOMPONENT_HXX_
-#define _INC_OLECOMPONENT_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLECOMPONENT_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLECOMPONENT_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 2aab2aabbe60..19db69b02dc8 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __OWNVIEW_HXX_
-#define __OWNVIEW_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OWNVIEW_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OWNVIEW_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 56c21a21d8cc..c69263894e35 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLATFORM_H_
-#define _PLATFORM_H_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_PLATFORM_H
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_PLATFORM_H
#define STRICT
#define _ATL_APARTMENT_THREADED
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 6770347c54f5..d6d3c81dea8f 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __INITIALIZABLEBITMAP_HXX_
-#define __INITIALIZABLEBITMAP_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_TEST_MTEXECUTOR_BITMAPCREATOR_HXX
+#define INCLUDED_EMBEDDEDOBJ_TEST_MTEXECUTOR_BITMAPCREATOR_HXX
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index a1a12b6b6222..7879ed399985 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __MAINTHREADEXECUTOR_HXX_
-#define __MAINTHREADEXECUTOR_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_TEST_MTEXECUTOR_MAINTHREADEXECUTOR_HXX
+#define INCLUDED_EMBEDDEDOBJ_TEST_MTEXECUTOR_MAINTHREADEXECUTOR_HXX
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/embedserv/source/inc/common.h b/embedserv/source/inc/common.h
index e770b5064cc1..4f223e919a73 100644
--- a/embedserv/source/inc/common.h
+++ b/embedserv/source/inc/common.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_COMMON_H
+#define INCLUDED_EMBEDSERV_SOURCE_INC_COMMON_H
#include "stdafx.h"
#include <initguid.h>
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 34c867c11b40..e6d0d4f0eabf 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EMBEDDOC_HXX_
-#define _EMBEDDOC_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
@@ -194,6 +194,6 @@ public:
}
};
-#endif //_EMBEDDOC_HXX_
+#endif // INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index b094ac0b4f8b..721fe8d18a77 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EMBEDDOCACCESS_HXX_
-#define _EMBEDDOCACCESS_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
#define OLESERV_SAVEOBJECT 1
#define OLESERV_CLOSE 2
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index 6dac501b65e3..d65ef00aaa6c 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EMBSERVCONST_H_
-#define _EMBSERVCONST_H_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBSERVCONST_H
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBSERVCONST_H
#include <guiddef.h>
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index d4f9f8b2eb02..17e97acf8341 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IIPAOBJ_HXX_
-#define _IIPAOBJ_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index ac40aaac68a1..1c0a012b26c8 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SERVPROV_HXX
-#define _SERVPROV_HXX
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
#include "common.h"
#include <oleidl.h>
diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx
index b8b02adac0b3..aa666dff0a79 100644
--- a/embedserv/source/inc/xwin.hxx
+++ b/embedserv/source/inc/xwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XWIN_HXX_
-#define _XWIN_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
#include "common.h"
diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h
index f5eb14c46611..95a28ed2f94f 100644
--- a/embedserv/source/inprocserv/inprocembobj.h
+++ b/embedserv/source/inprocserv/inprocembobj.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INPROCEMBOBJ_HXX_
-#define _INPROCEMBOBJ_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
+#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
#if defined _MSC_VER
#pragma warning(disable : 4668)
diff --git a/embedserv/source/inprocserv/smartpointer.hxx b/embedserv/source/inprocserv/smartpointer.hxx
index 57d22216bc6f..62011df14556 100644
--- a/embedserv/source/inprocserv/smartpointer.hxx
+++ b/embedserv/source/inprocserv/smartpointer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _INPROCSERV_SMARTPOINTER_HXX_
-#define _INPROCSERV_SMARTPOINTER_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_SMARTPOINTER_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_SMARTPOINTER_HXX
namespace inprocserv{
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index d8b12f59f2e7..083d50284165 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNO_CONVERSION_UTILITIES
-#define _UNO_CONVERSION_UTILITIES
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_UNOCONVERSIONUTILITIES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_UNOCONVERSIONUTILITIES_HXX
#include "boost/scoped_array.hpp"
#include "com/sun/star/script/XInvocationAdapterFactory.hpp"
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 0a1ada6cd544..6ea35ec41d73 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUAFILEPICKERDELEGATE_HXX_
-#define _AQUAFILEPICKERDELEGATE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX
#include <premac.h>
#include <Cocoa/Cocoa.h>
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 1b5ef0d40e2b..c844c5176a2c 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CFSTRINGUTILITIES_HXX_
-#define _CFSTRINGUTILITIES_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
#include <premac.h>
#include <Carbon/Carbon.h>
@@ -178,6 +178,6 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons
SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
}
-#endif //_CFSTRINGUTILITIES_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index b00aad9959bd..c77ed935b11d 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTROLHELPER_HXX_
-#define _CONTROLHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
@@ -183,6 +183,6 @@ private:
void layoutControls();
};
-#endif //_CONTROLHELPER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index ad42d07fe735..e3fe780563e0 100644
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FPSERVICEINFO_HXX_
-#define _FPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_FPSERVICEINFO_HXX
// the service names
#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.AquaFilePicker"
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 7facc808f363..0464b1ce4d9a 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILTERHELPER_HXX_
-#define _FILTERHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -121,6 +121,6 @@ private:
};
-#endif //_FILTERHELPER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index 52e5c41b72f6..c921393c6b5a 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _NSSTRING_OOOADDITIONS_HXX_
-#define _NSSTRING_OOOADDITIONS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
#include <premac.h>
#import <Cocoa/Cocoa.h>
@@ -32,6 +32,6 @@
- (OUString) OUString;
@end
-#endif // _NSSTRING_OOOADDITIONS_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index 811e9cf97748..5329e9261744 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _NSURL_OOOADDITIONS_HXX_
-#define _NSURL_OOOADDITIONS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX
#include <premac.h>
#include <CoreFoundation/CoreFoundation.h>
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index 7b18531abd69..591525ba8601 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALAQUACONSTANTS_H_
-#define _SALAQUACONSTANTS_H_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
#define kAppFourCharCode 'LibO'
#define kControlPropertyTracking 'Trck'
@@ -51,6 +51,6 @@
#define kAquaPopupButtonDefaultHeight (26)
-#endif //_SALAQUACONSTANTS_H_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 7932d8180d6e..d0f2a542d23e 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALAQUAFILEPICKER_HXX_
-#define _SALAQUAFILEPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
#include <cppuhelper/compbase4.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -220,6 +220,6 @@ public:
};
-#endif // _SALAQUAFILEPICKER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index aa13545071f8..313acb79dc34 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALAQUAFOLDERPICKER_HXX_
-#define _SALAQUAFOLDERPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/util/XCancellable.hpp>
@@ -110,6 +110,6 @@ private:
};
-#endif // _SALAQUAFOLDERPICKER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index dff3fed90644..076f22a1ecc2 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALAQUAFPICKER_HXX_
-#define _SALAQUAFPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX
#include <osl/mutex.hxx>
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 4a3d63227919..fd6647eabeb4 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _RESOURCEPROVIDER_HXX_
-#define _RESOURCEPROVIDER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX
#include <sal/types.h>
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index e629463032f6..890f860d7659 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_CONTROLACCESS_HXX
-#define SVTOOLS_CONTROLACCESS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
#include <svtools/fileview.hxx>
#include <vcl/lstbox.hxx>
@@ -113,6 +113,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_CONTROLACCESS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index e539fa2f339c..27d980876744 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVT_FILEPICKER_HXX
-#define INCLUDED_SVT_FILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
#include <cppuhelper/implbase5.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
@@ -227,6 +227,6 @@ private:
DECL_LINK( DialogClosedHdl, Dialog* );
};
-#endif // INCLUDED_SVT_FILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 8819e52cee96..a285ea0cd727 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVT_FOLDERPICKER_HXX
-#define INCLUDED_SVT_FOLDERPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
@@ -103,6 +103,6 @@ protected:
virtual sal_Int16 implExecutePicker( ) SAL_OVERRIDE;
};
-#endif // INCLUDED_SVT_FOLDERPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 125e54a86109..51d300b53697 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _PLACESLISTBOX_HXX_
-#define _PLACESLISTBOX_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX
#include <iodlg.hxx>
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index 2984f35b4447..9e71b1176d18 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_QUERYFOLDERNAME_HXX
-#define INCLUDED_QUERYFOLDERNAME_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
@@ -41,6 +41,6 @@ public:
OUString GetName() const { return m_pNameEdit->GetText(); }
};
-#endif // INCLUDED_QUERYFOLDERNAME_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index ae923c48028b..77a93e6f7f8a 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
-#define SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
#include <tools/link.hxx>
#include <rtl/ref.hxx>
@@ -102,6 +102,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index c103a91f8bc2..b8c175ee6d67 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_COMMONPICKER_HXX
-#define SVTOOLS_COMMONPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
#include <cppuhelper/compbase5.hxx>
#include <com/sun/star/ui/dialogs/XControlInformation.hpp>
@@ -192,6 +192,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_COMMONPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 7de39150cedc..9c9ef6052dbc 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_FILEPICKER_INTERACTION_HXX
-#define SVTOOLS_FILEPICKER_INTERACTION_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -80,6 +80,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_FILEPICKER_INTERACTION_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 3f16e539be88..7d3d7bd8c83d 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
-#define SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
#include "fpinteraction.hxx"
@@ -206,6 +206,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx
index 95af355c6d6c..7fb6f05ca5b9 100644
--- a/fpicker/source/office/fpsofficeResMgr.hxx
+++ b/fpicker/source/office/fpsofficeResMgr.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _FPS_OFFICE_RESMGR_HXX_
-#define _FPS_OFFICE_RESMGR_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX
#include <rtl/instance.hxx>
#include <tools/resmgr.hxx>
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index da6dcc14364a..b03ba84d027f 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IODLGIMPL_HXX
-#define _IODLGIMPL_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
@@ -453,6 +453,6 @@ inline SvtFileView* SvtFileDialog::GetView() const
#define DIALOG_SIZE_CHANGED 5
-#endif // #ifndef _IODLG_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index fb6a3fc11143..816d6ef91e0f 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IODLGIMP_HXX
-#define _IODLGIMP_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
#include <PlacesListBox.hxx>
@@ -271,7 +271,7 @@ inline void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter
SetCurFilter( pFilter, pFilter->GetName() );
}
-#endif // #ifndef _IODLGIMP_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index 1981b7cabf0a..0bf794940f71 100644
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVTOOLS_PICKER_CALLBACKS_HXX
-#define SVTOOLS_PICKER_CALLBACKS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -56,6 +56,6 @@ namespace svt
} // namespace svt
-#endif // SVTOOLS_PICKER_CALLBACKS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index 01b1bbf2f866..9e03045a6bd3 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _FPSERVICEINFO_HXX_
-#define _FPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FPSERVICEINFO_HXX
// the service name is a description of a set of
// interfaces (is the same as component categories in COM)
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index de3f79e1b0c0..054f7466749d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILEOPENDLG_HXX_
-#define _FILEOPENDLG_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEOPENDLG_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEOPENDLG_HXX
#include <sal/types.h>
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 92240cf7715e..9aee615b9509 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILEPICKER_HXX_
-#define _FILEPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
#include <cppuhelper/compbase6.hxx>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 1aeddff1abe0..26e755d6efbe 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILTER_CONTAINER_HXX_
-#define _FILTER_CONTAINER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 19c74370e4e3..56ac6b1d54a1 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
#include "comptr.hxx"
#include "vistatypes.h"
@@ -50,6 +50,6 @@ class IVistaFilePickerInternalNotify
}}}
-#endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index 60117965765f..e826e5431a89 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PREVIEWCTRL_HXX_
-#define _PREVIEWCTRL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWCTRL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWCTRL_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 2ce0b1f4c407..2cb7093960f4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
#include "asyncrequests.hxx"
#include "VistaFilePickerImpl.hxx"
@@ -280,6 +280,6 @@ public:
} // namespace win32
} // namespace fpicker
-#endif // FPICKER_WIN32_VISTA_FILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 2d8901d17704..98a61afc0b24 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
#ifdef _MSC_VER
#pragma warning( disable : 4917 )
@@ -203,6 +203,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
-#endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 2b05cc54b333..47e1be65a5e8 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
#ifdef _MSC_VER
#pragma warning( disable : 4917 )
@@ -341,6 +341,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
-#endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index d4b2a3bfc07e..3383b89eaad5 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _WINFILEOPENIMPL_HXX_
-#define _WINFILEOPENIMPL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_WINFILEOPENIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_WINFILEOPENIMPL_HXX
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index 731eccf85fe6..14f65f053bc5 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ASYNCEVENTNOTIFIER_HXX_
-#define _ASYNCEVENTNOTIFIER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCEVENTNOTIFIER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCEVENTNOTIFIER_HXX
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 887a696cb400..413ff965ea6d 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
-#define FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
#include <cppuhelper/basemutex.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -204,6 +204,6 @@ class AsyncRequests : private ::cppu::BaseMutex
} // namespace win32
} // namespace fpicker
-#endif // FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx
index a9ed6a60c07a..289179ea0254 100644
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/filepicker/comptr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPTR_HXX
-#define COMPTR_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_COMPTR_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_COMPTR_HXX
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index ee990f6e2cb6..f3eb55243ea6 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _CONTROLACCESS_HXX_
-#define _CONTROLACCESS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLACCESS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLACCESS_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index 04ba63c8b6e7..ae63ff802eb6 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTROLCOMMAND_HXX_
-#define _CONTROLCOMMAND_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMAND_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMAND_HXX
#include <sal/types.h>
#include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index c85e0a19e27d..f62cfd3a35c7 100644
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTROLCOMMANDREQUEST_HXX_
-#define _CONTROLCOMMANDREQUEST_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDREQUEST_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDREQUEST_HXX
#include <sal/types.h>
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 5d03e606f7f4..2abd1e8bd54e 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CONTROLCOMMANDRESULT_HXX_
-#define _CONTROLCOMMANDRESULT_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDRESULT_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDRESULT_HXX
#include <sal/types.h>
#include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx
index 49aadd7aa960..e209172a18ea 100644
--- a/fpicker/source/win32/filepicker/customcontrol.hxx
+++ b/fpicker/source/win32/filepicker/customcontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUSTOMCONTROL_HXX_
-#define _CUSTOMCONTROL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROL_HXX
#include <sal/types.h>
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
index 5eea68099c8b..6b61253168a9 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUSTOMCONTROLCONTAINER_HXX_
-#define _CUSTOMCONTROLCONTAINER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLCONTAINER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLCONTAINER_HXX
#include "customcontrol.hxx"
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index e10a1b58db28..742cc7a6e3ba 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUSTOMCONTROLFACTORY_HXX_
-#define _CUSTOMCONTROLFACTORY_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLFACTORY_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLFACTORY_HXX
#if defined _MSC_VER
#pragma warning(push, 1)
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
index fbe233512e63..a9f2d1a50a22 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DIALOGCUSTOMCONTROLS_HXX_
-#define _DIALOGCUSTOMCONTROLS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIALOGCUSTOMCONTROLS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIALOGCUSTOMCONTROLS_HXX
#include "customcontrol.hxx"
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 61d338f8c0f2..14ab01a08b16 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DIBPREVIEW_HXX_
-#define _DIBPREVIEW_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIBPREVIEW_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIBPREVIEW_HXX
#include "previewbase.hxx"
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index 209343526218..e726b91ee660 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EVENTNOTIFICATION_HXX_
-#define _EVENTNOTIFICATION_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_EVENTNOTIFICATION_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_EVENTNOTIFICATION_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index e33523c80e80..7edac324a42c 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILEPICKEREVENTNOTIFICATION_HXX_
-#define _FILEPICKEREVENTNOTIFICATION_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKEREVENTNOTIFICATION_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKEREVENTNOTIFICATION_HXX
#include "eventnotification.hxx"
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index d0be2441a855..10953bc09012 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILEPICKERSTATE_HXX_
-#define _FILEPICKERSTATE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKERSTATE_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKERSTATE_HXX
#include <sal/types.h>
#include "controlcommand.hxx"
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 2ec0e4da597b..0d5604923e74 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GETFILENAMEWRAPPER_HXX_
-#define _GETFILENAMEWRAPPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_GETFILENAMEWRAPPER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_GETFILENAMEWRAPPER_HXX
#include <sal/types.h>
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index ec6351f4231b..905bb6785646 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HELPPOPUPWINDOW_HXX_
-#define _HELPPOPUPWINDOW_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_HELPPOPUPWINDOW_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_HELPPOPUPWINDOW_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index d2a52d0482d6..1d8dea84b038 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLATFORM_VISTA_H_
-#define _PLATFORM_VISTA_H_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
#pragma once
diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index a31cbc40e037..4d4792a29dff 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PLATFORM_XP_H_
-#define _PLATFORM_XP_H_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_XP_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_XP_H
#pragma once
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 5eaf9bce0b35..fc05fa0013c0 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PREVIEWADAPTER_HXX_
-#define _PREVIEWADAPTER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWADAPTER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWADAPTER_HXX
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 220fdb7f6433..6a449da8210b 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PREVIEWBASE_HXX_
-#define _PREVIEWBASE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWBASE_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWBASE_HXX
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index 3966e1e4055e..fe4db2871222 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_FILEPICKER_SHARED_HXX
-#define FPICKER_WIN32_FILEPICKER_SHARED_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index 2ca8700b5047..727416e9f2a1 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FPICKER_WIN32_VISTA_TYPES_HXX
-#define FPICKER_WIN32_VISTA_TYPES_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
#include "comptr.hxx"
#include <shobjidl.h>
@@ -41,6 +41,6 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize
} // namespace win32
} // namespace fpicker
-#endif // FPICKER_WIN32_VISTA_TYPES_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index 14c06b91fadb..d08586e007d1 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _FOPSERVICEINFO_HXX_
-#define _FOPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPSERVICEINFO_HXX
// the service name is a description of a set of
// interfaces (is the same as component categories in COM)
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 619ded48f5d9..721ad68d4fb8 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FOLDERPICKER_HXX_
-#define _FOLDERPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
#include <cppuhelper/implbase2.hxx>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index 240a9f336b4a..e2fb45f87055 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _FOPEVENTDISPATCHER_HXX_
-#define _FOPEVENTDISPATCHER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPEVTDISP_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPEVTDISP_HXX
#include <com/sun/star/lang/EventObject.hpp>
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 6469d93441b0..683c8e8209e7 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MTAFOP_HXX_
-#define _MTAFOP_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index b464d15874ef..1dd59cc6d61a 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _WINFOPIMPL_HXX_
-#define _WINFOPIMPL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_WINFOPIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_WINFOPIMPL_HXX
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include "MtaFop.hxx"
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 52ed28dd15ee..11fe51813f8f 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _WINIMPLHELPER_HXX_
-#define _WINIMPLHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index d02164faf37e..32f3b118f759 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef _RESOURCEPROVIDER_HXX_
-#define _RESOURCEPROVIDER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX
#include <sal/types.h>
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index db2728f5a17a..c2dbeaa7126c 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -113,6 +113,6 @@ class QuietInteraction : public ::cppu::WeakImplHelper1<
} // namespace framework
-#endif // #ifndef __FRAMEWORK_INTERACTION_STILLINTERACTION_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 2025ed6a48e2..5d6ad0a76072 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
-#define INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
#include <sal/config.h>
@@ -84,6 +84,6 @@ namespace framework {
} // namespace framework
-#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_CONFIGURATIONACCESSFACTORYMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 11329a2017d6..dbcd165fd154 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -114,6 +114,6 @@ class WindowCommandDispatch
} // namespace framework
-#endif // #ifndef __FRAMEWORK_DISPATCH_MACDISPATCH_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_WINDOWCOMMANDDISPATCH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index bca243404013..beb857243e7b 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_BREAKITERATOR_HXX_
-#define _I18N_BREAKITERATOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
@@ -141,6 +141,6 @@ private :
} // com
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 4a0c93d8ca57..892bd6130e9e 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_BREAKITERATOR_CJK_HXX_
-#define _I18N_BREAKITERATOR_CJK_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
#include <breakiterator_unicode.hxx>
#include <xdictionary.hxx>
@@ -66,6 +66,6 @@ BREAKITERATOR_CJK( ko )
} } } }
-#endif // _I18N_BREAKITERATOR_CJK_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 6c9e840757da..d2e90261b2d0 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __BREAKITERATOR_CTL_HXX__
-#define __BREAKITERATOR_CTL_HXX__
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
#include <breakiterator_unicode.hxx>
#include <xdictionary.hxx>
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index cee1b52292e6..8de057b82e31 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_BREAKITERATOR_TH_HXX_
-#define _I18N_BREAKITERATOR_TH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
#include <breakiterator_ctl.hxx>
namespace com { namespace sun { namespace star { namespace i18n {
@@ -37,6 +37,6 @@ protected:
} } } }
-#endif // _I18N_BREAKITERATOR_TH_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 3f78120e97b2..c72c2d616913 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_BREAKITERATOR_UNICODE_HXX_
-#define _I18N_BREAKITERATOR_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_UNICODE_HXX
#include <breakiteratorImpl.hxx>
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 4bbdc5fa62a4..9fd6dc31bdba 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CALENDARIMPL_HXX_
-#define _I18N_CALENDARIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX
#include <com/sun/star/i18n/XCalendar3.hpp>
#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index da071da4fffa..43bc4612e423 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CALENDAR_GREGORIAN_HXX_
-#define _I18N_CALENDAR_GREGORIAN_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX
#include "calendarImpl.hxx"
#include "nativenumbersupplier.hxx"
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index 80290a58a089..abc727adb04e 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CALENDAR_HIJRI_HXX_
-#define _I18N_CALENDAR_HIJRI_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_HIJRI_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_HIJRI_HXX
#include "calendar_gregorian.hxx"
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index c03efba8b342..fa350dc8a37e 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CALENDAR_JEWISH_HXX_
-#define _I18N_CALENDAR_JEWISH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_JEWISH_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_JEWISH_HXX
#include "calendar_gregorian.hxx"
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index efe8c0730056..1a559173569b 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CCLASS_UNICODE_HXX_
-#define _I18N_CCLASS_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 96807c497dfa..96286b3433f2 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CHAPTERCOLLATOR_HXX_
-#define _I18N_CHAPTERCOLLATOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX
+#define INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX
#include <collatorImpl.hxx>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 024453e67041..c7c93dd2d6d7 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_CHARACTERCLASSIFICATIONIMPL_HXX_
-#define _I18N_CHARACTERCLASSIFICATIONIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 8a614873124b..99895914c272 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_COLLATORIMPL_HXX_
-#define _I18N_COLLATORIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 934b9b7dd728..951de9c7f4c1 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_COLLATOR_UNICODE_HXX_
-#define _I18N_COLLATOR_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_COLLATOR_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_COLLATOR_UNICODE_HXX
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/i18n/XCollator.hpp>
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 42d3c2831bc9..965296eb38f9 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_DEFAULT_NUMBERING_PROVIDER_HXX_
-#define _I18N_DEFAULT_NUMBERING_PROVIDER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_DEFAULTNUMBERINGPROVIDER_HXX
+#define INCLUDED_I18NPOOL_INC_DEFAULTNUMBERINGPROVIDER_HXX
#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
#include <com/sun/star/text/XNumberingFormatter.hpp>
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 0c2f667d87a3..d442c39a1d50 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INDEXENTRYSUPPLIER_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_HXX
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
#include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 2f6afd1283e3..7646712383fe 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INDEXENTRYSUPPLIER_ASIAN_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_ASIAN_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_ASIAN_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_ASIAN_HXX
#include <indexentrysupplier_common.hxx>
#include <osl/module.h>
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 9e72ef36a8c1..a743f55b6f4c 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INDEXENTRYSUPPLIER_COMMON_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_COMMON_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_COMMON_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_COMMON_HXX
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
#include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index bae7c492443c..bc24e1dc8ab5 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INDEXENTRYSUPPLIER_DEFAULT_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_DEFAULT_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_DEFAULT_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_DEFAULT_HXX
#include <indexentrysupplier_common.hxx>
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index c91f483604df..ac94b40bffce 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX
#include <indexentrysupplier_common.hxx>
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 8fe3601cdbd5..9114c0ee1a4b 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INPUTCHECKER_HXX_
-#define _I18N_INPUTCHECKER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -77,6 +77,6 @@ private :
} } } }
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 0b854f0caf81..e6f1a91ddca6 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INPUTSEQUENCECHECKER_HI_HXX_
-#define _I18N_INPUTSEQUENCECHECKER_HI_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HI_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HI_HXX
#include <inputsequencechecker.hxx>
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index ec03fe315538..89c99e8cd70e 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_INPUTSEQUENCECHECKER_TH_HXX_
-#define _I18N_INPUTSEQUENCECHECKER_TH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
#include <inputsequencechecker.hxx>
@@ -41,6 +41,6 @@ public:
} } } }
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 1c08c385f2cd..8b848221bf65 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_LOCALEDATA_HXX_
-#define _I18N_LOCALEDATA_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
+#define INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -152,6 +152,6 @@ private :
} } } }
-#endif // _I18N_LOCALEDATA_HXX_
+#endif // INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index c5848f075609..750b5095fff5 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_NATIVENUMBERSUPPLIER_HXX_
-#define _I18N_NATIVENUMBERSUPPLIER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
+#define INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
#include <com/sun/star/i18n/NativeNumberMode.hpp>
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index c4461db877d1..65bb0056fe7f 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_NUMBERFORMATCODE_HXX_
-#define _I18N_NUMBERFORMATCODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
+#define INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
@@ -70,6 +70,6 @@ private:
};
-#endif // _I18N_NUMBERFORMATCODE_HXX_
+#endif // INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index 7a8d0d11418e..1a5f14a8fe06 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.hxx
@@ -54,8 +54,8 @@ Implementation Name
*/
-#ifndef _I18N_SERVICENAME_HXX_
-#define _I18N_SERVICENAME_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
+#define INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
#define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration"
#define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "."
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 0addc1b006e4..73c7581c10c0 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATION_TEXTTOPRONOUNCE_ZH_HXX_
-#define _I18N_TRANSLITERATION_TEXTTOPRONOUNCE_ZH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX
#include <transliteration_Ignore.hxx>
#include <indexentrysupplier_asian.hxx>
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 7c4d1945a718..d068c0e8d66e 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TEXTCONVERSION_KO_HXX_
-#define _I18N_TEXTCONVERSION_KO_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index ed81c0e53772..1320f38b0c8e 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TEXTCONERSION_HXX_
-#define _I18N_TEXTCONERSION_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index a12061647a37..a1d34a0ce6e6 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATIONIMPL_HXX_
-#define _I18N_TRANSLITERATIONIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
#include <com/sun/star/i18n/XLocaleData4.hpp>
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index f57e1da04ffd..da3ed51a08fa 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
#include <transliteration_commonclass.hxx>
#include <i18nutil/oneToOneMapping.hxx>
@@ -146,6 +146,6 @@ TRANSLITERATION_IGNORE(Size_ja_JP)
} } } }
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index fa6d92c5a2a8..c854c14cdaf1 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
#include <transliteration_commonclass.hxx>
@@ -62,6 +62,6 @@ private:
} } } }
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index db6b116407bc..afd31b39f0d4 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
#include <transliteration_commonclass.hxx>
#include <i18nutil/oneToOneMapping.hxx>
@@ -98,6 +98,6 @@ TRANSLITERATION_ONETOONE(smallToLarge_ja_JP)
} } } }
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 4f4b2183a570..ee976eaf4000 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TRANSLITERATION_BODY_H
-#define TRANSLITERATION_BODY_H
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_BODY_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_BODY_HXX
#include <transliteration_commonclass.hxx>
#include <i18nutil/casefolding.hxx>
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 55596b606568..2949cabc2184 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef TRANSLITERATION_CASE_IGNORE_H
-#define TRANSLITERATION_CASE_IGNORE_H
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_CASEIGNORE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_CASEIGNORE_HXX
#define TRANSLITERATION_UPPER_LOWER
#include "transliteration_body.hxx"
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index c27571f5215b..d9580b236d28 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
#include <com/sun/star/i18n/TransliterationType.hpp>
@@ -114,6 +114,6 @@ protected:
} } } }
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index d6ab941eee92..d10a17de87c8 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_UNOSCRIPTTYPEDETECTOR_HXX_
-#define _I18N_UNOSCRIPTTYPEDETECTOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_UNOSCRIPTTYPEDETECTOR_HXX
+#define INCLUDED_I18NPOOL_INC_UNOSCRIPTTYPEDETECTOR_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h
index 857751ccc852..d09c3d03a5e9 100644
--- a/i18npool/inc/wtt.h
+++ b/i18npool/inc/wtt.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _I18N_WTT_H_
-#define _I18N_WTT_H_
+#ifndef INCLUDED_I18NPOOL_INC_WTT_H
+#define INCLUDED_I18NPOOL_INC_WTT_H
namespace com { namespace sun { namespace star { namespace i18n {
@@ -63,6 +63,6 @@ static const sal_uInt16 thaiCT[128] = { // Thai character type
} } } }
-#endif // _I18N_WTT_H_
+#endif // INCLUDED_I18NPOOL_INC_WTT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 2b1ece0d2447..57f5238ac853 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XDICTIONARY_H_
-#define _XDICTIONARY_H_
+#ifndef INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX
+#define INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX
#include <sal/types.h>
#include <osl/module.h>
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 89e85bc39431..2c48206b070e 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _LOCALE_NODE_
-#define _LOCALE_NODE_
+#ifndef INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
+#define INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index a9f7407d0bde..7a477ea17550 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_I18NPOOL_LEVDIS_HXX
-#define INCLUDED_I18NPOOL_LEVDIS_HXX
+#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
+#define INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
#include <rtl/ustring.hxx>
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 39338e767aa6..760052a54e13 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_I18NPOOL_TEXTSEARCH_HXX
-#define INCLUDED_I18NPOOL_TEXTSEARCH_HXX
+#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
+#define INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/util/XTextSearch.hpp>
diff --git a/i18nutil/source/utility/casefolding_data.h b/i18nutil/source/utility/casefolding_data.h
index c41e8ba665f9..3dad13ba464e 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CASEFOLDING_DATA_H
-#define CASEFOLDING_DATA_H
+#ifndef INCLUDED_I18NUTIL_SOURCE_UTILITY_CASEFOLDING_DATA_H
+#define INCLUDED_I18NUTIL_SOURCE_UTILITY_CASEFOLDING_DATA_H
#include <sal/types.h>
diff --git a/i18nutil/source/utility/unicode_data.h b/i18nutil/source/utility/unicode_data.h
index 67f7a25653ee..bae66cd3f7b8 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CCLASS_CHARTYPE_H
-#define CCLASS_CHARTYPE_H
+#ifndef INCLUDED_I18NUTIL_SOURCE_UTILITY_UNICODE_DATA_H
+#define INCLUDED_I18NUTIL_SOURCE_UTILITY_UNICODE_DATA_H
#include <sal/types.h>
diff --git a/i18nutil/source/utility/widthfolding_data.h b/i18nutil/source/utility/widthfolding_data.h
index 633834c9d4f5..5e6855e7e0d5 100644
--- a/i18nutil/source/utility/widthfolding_data.h
+++ b/i18nutil/source/utility/widthfolding_data.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_I18NUTIL_CASEFOLDING_DATA_H
-#define INCLUDED_I18NUTIL_CASEFOLDING_DATA_H
+#ifndef INCLUDED_I18NUTIL_SOURCE_UTILITY_WIDTHFOLDING_DATA_H
+#define INCLUDED_I18NUTIL_SOURCE_UTILITY_WIDTHFOLDING_DATA_H
#include <i18nutil/oneToOneMapping.hxx>
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 42cf191d7bbd..aaecabe82d0c 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -118,6 +118,6 @@ public:
void FillHashList( SvStringHashList * rList ) const;
};
-#endif // _RSCHASH_HXX
+#endif // INCLUDED_IDL_INC_HASH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx
index ff249ab23fa3..e1f7b20a5afb 100644
--- a/include/comphelper/scoped_disposing_ptr.hxx
+++ b/include/comphelper/scoped_disposing_ptr.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _SCOPED_DISPOSING_PTR
-#define _SCOPED_DISPOSING_PTR
+#ifndef INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
+#define INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
#include <cppuhelper/implbase1.hxx>
#include <boost/utility.hpp>
diff --git a/include/svl/svldllapi.h b/include/svl/svldllapi.h
index cd4ae4f42a7a..0e62d3f3b177 100644
--- a/include/svl/svldllapi.h
+++ b/include/svl/svldllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVLDLLAPI_H
-#define INCLUDED_SVLDLLAPI_H
+#ifndef INCLUDED_SVL_SVLDLLAPI_H
+#define INCLUDED_SVL_SVLDLLAPI_H
#include <sal/types.h>
@@ -29,6 +29,6 @@
#endif
#define SVL_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_SVLDLLAPI_H */
+#endif // INCLUDED_SVL_SVLDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/systools/win32/comptr.hxx b/include/systools/win32/comptr.hxx
index 5e5b6b6886c1..db027274bc63 100644
--- a/include/systools/win32/comptr.hxx
+++ b/include/systools/win32/comptr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef COMPTR_HXX
-#define COMPTR_HXX
+#ifndef INCLUDED_SYSTOOLS_WIN32_COMPTR_HXX
+#define INCLUDED_SYSTOOLS_WIN32_COMPTR_HXX
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/include/systools/win32/snprintf.h b/include/systools/win32/snprintf.h
index e5e60eaa9ada..92e571f91ee8 100644
--- a/include/systools/win32/snprintf.h
+++ b/include/systools/win32/snprintf.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SNPRINTF_H
-#define _SNPRINTF_H
+#ifndef INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
+#define INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
#if !defined(_WIN32)
#error ERROR: Only Win32 target supported!
@@ -83,6 +83,6 @@ _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char
}
#endif
-#endif /* _SNPRINTF_H */
+#endif // INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/htmltesttools.hxx b/include/test/htmltesttools.hxx
index 99d6bcf9eb89..1cc493241e83 100644
--- a/include/test/htmltesttools.hxx
+++ b/include/test/htmltesttools.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef HTML_TEST_TOOLS_H
-#define HTML_TEST_TOOLS_H
+#ifndef INCLUDED_TEST_HTMLTESTTOOLS_HXX
+#define INCLUDED_TEST_HTMLTESTTOOLS_HXX
#include <sal/config.h>
#include <test/testdllapi.hxx>
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 5a9cdb1fe3b0..3473f97a3c88 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef XML_TEST_TOOLS_H
-#define XML_TEST_TOOLS_H
+#ifndef INCLUDED_TEST_XMLTESTTOOLS_HXX
+#define INCLUDED_TEST_XMLTESTTOOLS_HXX
#include <sal/config.h>
#include <test/testdllapi.hxx>
diff --git a/include/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h
index b54b705d46d0..ff4861de5b67 100644
--- a/include/vbahelper/vbadllapi.h
+++ b/include/vbahelper/vbadllapi.h
@@ -29,6 +29,6 @@
#endif
#define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_SVLDLLAPI_H */
+#endif // INCLUDED_VBAHELPER_VBADLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx
index 356257f6a899..fe7154832298 100644
--- a/include/vcl/oldprintadaptor.hxx
+++ b/include/vcl/oldprintadaptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_OLDPRINTADAPTOR
-#define _VCL_OLDPRINTADAPTOR
+#ifndef INCLUDED_VCL_OLDPRINTADAPTOR_HXX
+#define INCLUDED_VCL_OLDPRINTADAPTOR_HXX
#include <vcl/print.hxx>
diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx
index cda9e629b864..d35c02b9c8ea 100644
--- a/include/vcl/outdevmap.hxx
+++ b/include/vcl/outdevmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OUTDEVMAP_HXX
-#define INCLUDED_VCL_INC_OUTDEVMAP_HXX
+#ifndef INCLUDED_VCL_OUTDEVMAP_HXX
+#define INCLUDED_VCL_OUTDEVMAP_HXX
struct ImplMapRes
@@ -39,6 +39,6 @@ struct ImplThresholdRes
long mnThresPixToLogY; // ""
};
-#endif // INCLUDED_VCL_INC_OUTDEVMAP_HXX
+#endif // INCLUDED_VCL_OUTDEVMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index 1a08845f9694..39aedcbab390 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OUTDEVSTATE_HXX
-#define INCLUDED_VCL_INC_OUTDEVSTATE_HXX
+#ifndef INCLUDED_VCL_OUTDEVSTATE_HXX
+#define INCLUDED_VCL_OUTDEVSTATE_HXX
#include <sal/types.h>
@@ -73,6 +73,6 @@ public:
sal_uInt16 mnFlags;
};
-#endif // INCLUDED_VCL_INC_OUTDEVSTATE_HXX
+#endif // INCLUDED_VCL_OUTDEVSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgcci/jni_md.h b/include/wntgcci/jni_md.h
index e77438d75e6b..3e596f45ac65 100644
--- a/include/wntgcci/jni_md.h
+++ b/include/wntgcci/jni_md.h
@@ -19,8 +19,8 @@
/* Fake jni_md.h for use when cross-compiling to Windows */
-#ifndef JNI_MD_H_INCLUDED
-#define JNI_MD_H_INCLUDED
+#ifndef INCLUDED_WNTGCCI_JNI_MD_H
+#define INCLUDED_WNTGCCI_JNI_MD_H
#define JNIEXPORT __declspec (dllexport)
#define JNIIMPORT __declspec (dllimport)
@@ -30,6 +30,6 @@ typedef long jint;
typedef __int64 jlong;
typedef char jbyte;
-#endif /* JNI_MD_H_INCLUDED */
+#endif // INCLUDED_WNTGCCI_JNI_MD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgcci/sehandler.hxx b/include/wntgcci/sehandler.hxx
index 6f196d88e668..5ba2ec1f2402 100644
--- a/include/wntgcci/sehandler.hxx
+++ b/include/wntgcci/sehandler.hxx
@@ -4,8 +4,8 @@
// but from where it got there, I don't know.
-#ifndef _SEHANDLER_HXX
-#define _SEHANDLER_HXX
+#ifndef INCLUDED_WNTGCCI_SEHANDLER_HXX
+#define INCLUDED_WNTGCCI_SEHANDLER_HXX
#if !defined( __MINGW32__ ) || defined ( _WIN64 )
#error This file should be included only in a 32-bit MinGW compilation
@@ -125,4 +125,4 @@ private:
} // namespace {
-#endif // _SEHANDLER_HXX
+#endif // INCLUDED_WNTGCCI_SEHANDLER_HXX
diff --git a/include/wntgccx/jni_md.h b/include/wntgccx/jni_md.h
index 4d80f3878a6c..add4e2640d8a 100644
--- a/include/wntgccx/jni_md.h
+++ b/include/wntgccx/jni_md.h
@@ -19,8 +19,8 @@
/* Fake jni_md.h for use when cross-compiling to Windows */
-#ifndef JNI_MD_H_INCLUDED
-#define JNI_MD_H_INCLUDED
+#ifndef INCLUDED_WNTGCCX_JNI_MD_H
+#define INCLUDED_WNTGCCX_JNI_MD_H
#define JNIEXPORT __declspec (dllexport)
#define JNIIMPORT __declspec (dllimport)
@@ -30,6 +30,6 @@ typedef long jint;
typedef __int64 jlong;
typedef char jbyte;
-#endif /* JNI_MD_H_INCLUDED */
+#endif // INCLUDED_WNTGCCX_JNI_MD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgccx/sehandler.hxx b/include/wntgccx/sehandler.hxx
index 49bd0f21eb50..e80a8283e429 100644
--- a/include/wntgccx/sehandler.hxx
+++ b/include/wntgccx/sehandler.hxx
@@ -2,8 +2,8 @@
/* From mingw-w64 excpt.h */
-#ifndef _SEHANDLER_HXX
-#define _SEHANDLER_HXX
+#ifndef INCLUDED_WNTGCCX_SEHANDLER_HXX
+#define INCLUDED_WNTGCCX_SEHANDLER_HXX
#if !defined( __MINGW32__ ) || !defined ( _WIN64 )
#error This file should be included only in a 64-bit MinGW compilation
@@ -42,5 +42,5 @@
#endif
-#endif // _SEHANDLER_HXX
+#endif // INCLUDED_WNTGCCX_SEHANDLER_HXX
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 886e4bc60ae0..2bde5003c7c0 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__
-#define __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__
+#ifndef INCLUDED_XMLOFF_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER_HXX
+#define INCLUDED_XMLOFF_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER_HXX
#include <sal/config.h>
#include <xmloff/dllapi.h>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index d18e815c45c9..a536cad97cf0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
-#define INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_DIAGNOSTICS_H
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_DIAGNOSTICS_H
#include "sal/config.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 5fb6f9f66845..4c364a66c518 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_GNUJRE_HXX
-#define INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_GNUJRE_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_GNUJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index a9ced5d051a2..2c2b1b76e58b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
-#define INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_OTHERJRE_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_OTHERJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 69485b5b8c43..a25a8e5e3e79 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_SUNJRE_HXX
-#define INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNJRE_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNJRE_HXX
#include "vendorbase.hxx"
#include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index f2bb7265874d..e30d70c63d03 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMACCESS_SUNVERSION_HXX
-#define INCLUDED_JVMACCESS_SUNVERSION_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
#include "rtl/ustring.hxx"
@@ -117,6 +117,6 @@ protected:
}
-#endif // INCLUDED_JVMACCESS_SUNVERSION_HXX
+#endif // INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 103b3f4610db..7b1830909566 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_UTIL_HXX
-#define INCLUDED_JFW_PLUGIN_UTIL_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_HXX
#include "rtl/ustring.hxx"
#include "rtl/bootstrap.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index cc23b8928d6b..25baaee5f4f8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
-#define INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
#include "rtl/ustring.hxx"
#include "rtl/ref.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 98b7b8a1bff8..72fd317191c8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
-#define INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORLIST_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORLIST_HXX
#include "rtl/ref.hxx"
#include "vendorbase.hxx"
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index aaf22b0187b9..8fce7267edf4 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMFWK_ELEMENTS_HXX
-#define INCLUDED_JVMFWK_ELEMENTS_HXX
+#ifndef INCLUDED_JVMFWK_SOURCE_ELEMENTS_HXX
+#define INCLUDED_JVMFWK_SOURCE_ELEMENTS_HXX
#include <vector>
#include "jvmfwk/framework.h"
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index a884cd8ef3ff..87f87619ad04 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
-#define INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+#ifndef INCLUDED_JVMFWK_SOURCE_FRAMEWORK_HXX
+#define INCLUDED_JVMFWK_SOURCE_FRAMEWORK_HXX
#include "rtl/ustring.hxx"
#include "rtl/byteseq.hxx"
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 45a7dd2ac8c5..86fde79202e1 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMFWK_FWKBASE_HXX
-#define INCLUDED_JVMFWK_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
+#define INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
#include "rtl/ustring.hxx"
#include "libxmlutil.hxx"
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 66f438d80eed..e786943db4ee 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMFWK_FWKUTIL_HXX
-#define INCLUDED_JVMFWK_FWKUTIL_HXX
+#ifndef INCLUDED_JVMFWK_SOURCE_FWKUTIL_HXX
+#define INCLUDED_JVMFWK_SOURCE_FWKUTIL_HXX
#include <config_features.h>
#include <config_folders.h>
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index b99c04fbd5f4..c8f68ed041db 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_JVMFWK_LIBXMLUTIL_HXX
-#define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
+#define INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
#include "libxml/parser.h"
#include "libxml/xpath.h"
diff --git a/l10ntools/inc/xrmlex.hxx b/l10ntools/inc/xrmlex.hxx
index 3711ca66401d..2b159283d222 100644
--- a/l10ntools/inc/xrmlex.hxx
+++ b/l10ntools/inc/xrmlex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_L10NTOOLS_SOURCE_XRMLEX_HXX
-#define INCLUDED_L10NTOOLS_SOURCE_XRMLEX_HXX
+#ifndef INCLUDED_L10NTOOLS_INC_XRMLEX_HXX
+#define INCLUDED_L10NTOOLS_INC_XRMLEX_HXX
#include <sal/config.h>
diff --git a/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx
index e2dad61d23bd..30dd5e043732 100644
--- a/o3tl/qa/cow_wrapper_clients.hxx
+++ b/o3tl/qa/cow_wrapper_clients.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COW_WRAPPER_CLIENTS_HXX
-#define INCLUDED_COW_WRAPPER_CLIENTS_HXX
+#ifndef INCLUDED_O3TL_QA_COW_WRAPPER_CLIENTS_HXX
+#define INCLUDED_O3TL_QA_COW_WRAPPER_CLIENTS_HXX
#include "o3tl/cow_wrapper.hxx"
@@ -141,6 +141,6 @@ private:
} // namespace o3tltests
-#endif /* INCLUDED_COW_WRAPPER_CLIENTS_HXX */
+#endif // INCLUDED_O3TL_QA_COW_WRAPPER_CLIENTS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx
index 9090a5bc890d..ab63321fce91 100644
--- a/oox/inc/services.hxx
+++ b/oox/inc/services.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_OOX_SOURCE_CORE_SERVICES_HXX
-#define INCLUDED_OOX_SOURCE_CORE_SERVICES_HXX
+#ifndef INCLUDED_OOX_INC_SERVICES_HXX
+#define INCLUDED_OOX_INC_SERVICES_HXX
#include <sal/config.h>
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index eef09da6d5b8..da0f8328e50f 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PYUNO_PYUNO_HXX_
-#define _PYUNO_PYUNO_HXX_
+#ifndef INCLUDED_PYUNO_INC_PYUNO_PYUNO_HXX
+#define INCLUDED_PYUNO_INC_PYUNO_PYUNO_HXX
#ifndef Py_PYTHON_H
#if defined _MSC_VER
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index bca4dc29a8f4..de3c6f1a881f 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PYUNO_IMPL_
-#define _PYUNO_IMPL_
+#ifndef INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
+#define INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
#if defined(_MSC_VER) && (_MSC_VER >= 1600)
// Workaround for some horrible hypot() mess
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 7d76d18d32aa..189602fa72b8 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _KEYIMPL_HXX_
-#define _KEYIMPL_HXX_
+#ifndef INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
+#define INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
#include <registry/registry.h>
#include "regimpl.hxx"
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index 009dcdb90fec..b76475e0c75f 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _REFLCNST_HXX_
-#define _REFLCNST_HXX_
+#ifndef INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX
+#define INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX
#include <registry/refltype.hxx>
#include <sal/macros.h>
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 055e0d0a5770..ad751a1c0ca5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _REGIMPL_HXX_
-#define _REGIMPL_HXX_
+#ifndef INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX
+#define INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX
#include <set>
#include <boost/unordered_map.hpp>
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 69aa1b1dd325..82f82cb29150 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -18,8 +18,8 @@
*/
-#ifndef REG_DIAGNOSE_H
-#define REG_DIAGNOSE_H
+#ifndef INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H
+#define INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H
#include <osl/diagnose.h>
@@ -33,6 +33,6 @@
} while (0)
-#endif // REG_DIAGNOSE_H
+#endif // INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index b1b919205304..74bcf0b80ea7 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCALL_H
-#define _RSCALL_H
+#ifndef INCLUDED_RSC_INC_RSCALL_H
+#define INCLUDED_RSC_INC_RSCALL_H
#include <rsctools.hxx>
#include <rscerror.h>
@@ -101,6 +101,6 @@ struct SUBINFO_STRUCT
/******************* F u n c t i o n *************************************/
void InitRscCompiler();
-#endif // _RSCALL_H
+#endif // INCLUDED_RSC_INC_RSCALL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index cd55d07679e6..fc40e3fbf357 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCARRAY_HXX
-#define _RSCARRAY_HXX
+#ifndef INCLUDED_RSC_INC_RSCARRAY_HXX
+#define INCLUDED_RSC_INC_RSCARRAY_HXX
#include <rscall.h>
#include <rscerror.h>
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 6db763227d8a..7d2b09e35552 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCCLASS_HXX
-#define _RSCCLASS_HXX
+#ifndef INCLUDED_RSC_INC_RSCCLASS_HXX
+#define INCLUDED_RSC_INC_RSCCLASS_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -115,6 +115,6 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
};
-#endif //_RSCCLASS_HXX
+#endif // INCLUDED_RSC_INC_RSCCLASS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index 24b2d8b3d385..8cc515889976 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCCLOBJ_HXX
-#define _RSCCLOBJ_HXX
+#ifndef INCLUDED_RSC_INC_RSCCLOBJ_HXX
+#define INCLUDED_RSC_INC_RSCCLOBJ_HXX
#include <rsctree.hxx>
#include <rscdef.hxx>
@@ -90,6 +90,6 @@ public:
}
};
-#endif // _RSCCLOBJ_HXX
+#endif // INCLUDED_RSC_INC_RSCCLOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index cc76a3a79493..a574f951ee72 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCCONST_HXX
-#define _RSCCONST_HXX
+#ifndef INCLUDED_RSC_INC_RSCCONST_HXX
+#define INCLUDED_RSC_INC_RSCCONST_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -97,6 +97,6 @@ public:
Atom AddLanguage( const char* pLang, RscNameTable& rNames );
};
-#endif // _RSCCONST_HXX
+#endif // INCLUDED_RSC_INC_RSCCONST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 3e1f51b2e721..2cc19880d599 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCCONT_HXX
-#define _RSCCONT_HXX
+#ifndef INCLUDED_RSC_INC_RSCCONT_HXX
+#define INCLUDED_RSC_INC_RSCCONT_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -134,6 +134,6 @@ public:
RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
};
-#endif //_RSCCONT_HXX
+#endif // INCLUDED_RSC_INC_RSCCONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 7708d981d951..b824483058f6 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCDB_HXX
-#define _RSCDB_HXX
+#ifndef INCLUDED_RSC_INC_RSCDB_HXX
+#define INCLUDED_RSC_INC_RSCDB_HXX
#include <rscall.h>
#include <rsckey.hxx>
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index c38f3d9682a2..069701298421 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCDEF_HXX
-#define _RSCDEF_HXX
+#ifndef INCLUDED_RSC_INC_RSCDEF_HXX
+#define INCLUDED_RSC_INC_RSCDEF_HXX
#include <tools/unqidx.hxx>
#include <rsctree.hxx>
@@ -267,6 +267,6 @@ public:
RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
};
-#endif // _RSCDEF_HXX
+#endif // INCLUDED_RSC_INC_RSCDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 4e7706cae70b..7cab3d52cefe 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -19,8 +19,8 @@
#include <sal/types.h>
-#ifndef _RSCERROR_H
-#define _RSCERROR_H
+#ifndef INCLUDED_RSC_INC_RSCERROR_H
+#define INCLUDED_RSC_INC_RSCERROR_H
// Return errors
#define ERR_OK 0xFFFFFFFF
@@ -147,6 +147,6 @@ public:
const char * pMessage = NULL );
};
-#endif // _RSCERROR_H
+#endif // INCLUDED_RSC_INC_RSCERROR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index 2d77fa2090a7..875ebadabf92 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCFLAG_HXX
-#define _RSCFLAG_HXX
+#ifndef INCLUDED_RSC_INC_RSCFLAG_HXX
+#define INCLUDED_RSC_INC_RSCFLAG_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -100,6 +100,6 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
};
-#endif // _RSCFLAG_HXX
+#endif // INCLUDED_RSC_INC_RSCFLAG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index b8f734445394..9eced4737414 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCHASH_HXX
-#define _RSCHASH_HXX
+#ifndef INCLUDED_RSC_INC_RSCHASH_HXX
+#define INCLUDED_RSC_INC_RSCHASH_HXX
#include <sal/types.h>
#include <rtl/string.hxx>
@@ -42,6 +42,6 @@ class AtomContainer
};
-#endif // _RSCHASH_HXX
+#endif // INCLUDED_RSC_INC_RSCHASH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 5b79b7f18940..099b20cef580 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCKEY_HXX
-#define _RSCKEY_HXX
+#ifndef INCLUDED_RSC_INC_RSCKEY_HXX
+#define INCLUDED_RSC_INC_RSCKEY_HXX
// class forwards
class RscTop;
@@ -49,6 +49,6 @@ public:
bool Get( Atom nName, KEY_STRUCT * pEle );
};
-#endif// _RSCKEY_HXX
+#endif // INCLUDED_RSC_INC_RSCKEY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 57ff85a016af..48f09becf533 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCMGR_HXX
-#define _RSCMGR_HXX
+#ifndef INCLUDED_RSC_INC_RSCMGR_HXX
+#define INCLUDED_RSC_INC_RSCMGR_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -62,6 +62,6 @@ public:
ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE;
};
-#endif //_RSCMGR_HXX
+#endif // INCLUDED_RSC_INC_RSCMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 78f64fc6b83a..0b9bc4cb0afc 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCPAR_HXX
-#define _RSCPAR_HXX
+#ifndef INCLUDED_RSC_INC_RSCPAR_HXX
+#define INCLUDED_RSC_INC_RSCPAR_HXX
#include <rsctools.hxx>
#include <rscerror.h>
@@ -77,6 +77,6 @@ public:
void IncludeParser( RscFileInst * pFileInst );
ERRTYPE parser( RscFileInst * pFileInst );
-#endif // _RSCPAR_HXX
+#endif // INCLUDED_RSC_INC_RSCPAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 91d88ff5efb8..daea501c57dc 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCRANGE_HXX
-#define _RSCRANGE_HXX
+#ifndef INCLUDED_RSC_INC_RSCRANGE_HXX
+#define INCLUDED_RSC_INC_RSCRANGE_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -183,6 +183,6 @@ public:
ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
};
-#endif // _RSCRANGE_HXX
+#endif // INCLUDED_RSC_INC_RSCRANGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 182beec9a316..5842276c0d8d 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCRSC_HXX
-#define _RSCRSC_HXX
+#ifndef INCLUDED_RSC_INC_RSCRSC_HXX
+#define INCLUDED_RSC_INC_RSCRSC_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -102,6 +102,6 @@ public:
void EndCompile();
};
-#endif //_RSCRSC_HXX
+#endif // INCLUDED_RSC_INC_RSCRSC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index e56e396c583a..2b8ba770783d 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCSTR_HXX
-#define _RSCSTR_HXX
+#ifndef INCLUDED_RSC_INC_RSCSTR_HXX
+#define INCLUDED_RSC_INC_RSCSTR_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -63,6 +63,6 @@ public:
RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
};
-#endif // _RSCSTR_HXX
+#endif // INCLUDED_RSC_INC_RSCSTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 7fd10682b39c..e8d71fd541dd 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -19,8 +19,8 @@
struct RSHEADER_TYPE;
class RscPtrPtr;
-#ifndef _RSCTOOLS_HXX
-#define _RSCTOOLS_HXX
+#ifndef INCLUDED_RSC_INC_RSCTOOLS_HXX
+#define INCLUDED_RSC_INC_RSCTOOLS_HXX
#ifdef UNX
#include <stdlib.h>
@@ -210,6 +210,6 @@ public:
}
};
-#endif // _RSCTOOLS_HXX
+#endif // INCLUDED_RSC_INC_RSCTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 0929db770d4c..4570dd0752a5 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCTOP_HXX
-#define _RSCTOP_HXX
+#ifndef INCLUDED_RSC_INC_RSCTOP_HXX
+#define INCLUDED_RSC_INC_RSCTOP_HXX
#include <rscerror.h>
#include <rsctools.hxx>
@@ -215,6 +215,6 @@ public:
RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra );
};
-#endif //_RSCTOP_HXX
+#endif // INCLUDED_RSC_INC_RSCTOP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 9d4ec944bfa5..29c4f15122e5 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCTREE_HXX
-#define _RSCTREE_HXX
+#ifndef INCLUDED_RSC_INC_RSCTREE_HXX
+#define INCLUDED_RSC_INC_RSCTREE_HXX
#include <tools/link.hxx>
#include <rsctools.hxx>
@@ -101,6 +101,6 @@ public:
OString GetName() const { return m_aName; }
};
-#endif // _RSCTREE_HXX
+#endif // INCLUDED_RSC_INC_RSCTREE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 6c261c4282ac..cfc85a289c04 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -23,9 +23,7 @@
#include <ctype.h>
#include <limits.h>
-#ifdef _RSCERROR_H
#include <rscerror.h>
-#endif
#include <rschash.hxx>
#include <rscdb.hxx>
#include <rsctop.hxx>
diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index f31edaaa3c7b..48e7fba81026 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -22,8 +22,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef UTHASH_H
-#define UTHASH_H
+#ifndef INCLUDED_SAL_ANDROID_UTHASH_H
+#define INCLUDED_SAL_ANDROID_UTHASH_H
#include <string.h> /* memcmp,strlen */
#include <stddef.h> /* ptrdiff_t */
@@ -967,6 +967,6 @@ typedef struct UT_hash_handle {
unsigned hashv; /* result of hash-fcn(key) */
} UT_hash_handle;
-#endif /* UTHASH_H */
+#endif // INCLUDED_SAL_ANDROID_UTHASH_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/internal/oslmemory.h b/sal/inc/internal/oslmemory.h
index 8ef094ad3cad..011a6e320606 100644
--- a/sal/inc/internal/oslmemory.h
+++ b/sal/inc/internal/oslmemory.h
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SAL_INTERNAL_OSLMEMORY_H
-#define INCLUDED_SAL_INTERNAL_OSLMEMORY_H
+#ifndef INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H
+#define INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H
#include <sal/saldllapi.h>
#include <sal/types.h>
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/internal/rtllifecycle.h
index a6d373ec26b7..29a493b8a802 100644
--- a/sal/inc/internal/rtllifecycle.h
+++ b/sal/inc/internal/rtllifecycle.h
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SAL_INTERNAL_RTLLIFECYCLE_H
-#define INCLUDED_SAL_INTERNAL_RTLLIFECYCLE_H
+#ifndef INCLUDED_SAL_INC_INTERNAL_RTLLIFECYCLE_H
+#define INCLUDED_SAL_INC_INTERNAL_RTLLIFECYCLE_H
#if defined __cplusplus
extern "C" {
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index 7033e38d744a..2548dea042a2 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILE_ERROR_TRANSL_H_
-#define _FILE_ERROR_TRANSL_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
#include <osl/file.h>
#include <sal/types.h>
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index d1031bc07298..e1ed0affc8f2 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FILE_IMPL_HXX
-#define INCLUDED_FILE_IMPL_HXX
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
#include "osl/file.h"
#include <stddef.h>
@@ -53,6 +53,6 @@ oslFileError openFilePath(
oslFileHandle* pHandle,
sal_uInt32 uFlags, mode_t mode );
-#endif /* INCLUDED_FILE_IMPL_HXX */
+#endif // INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index bf084ba4e18c..799f497ce475 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#define _OSL_FILE_PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
#include <sal/types.h>
#include <rtl/ustring.h>
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index a2b4607ba5ab..6b1418daec9a 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_FILE_PATH_HELPER_HXX_
-#define _OSL_FILE_PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
#include "file_path_helper.h"
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 4f418b264705..10168636da52 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FILE_URL_H
-#define INCLUDED_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_URL_H
#include "osl/file.h"
@@ -39,6 +39,6 @@ int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_t
}
#endif
-#endif /* #define INCLUDED_FILE_URL_H */
+#endif /* #define INCLUDED_SAL_OSL_UNX_FILE_URL_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 057257e691f6..3a0babd4e53c 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __OSL_SYSTEM_H__
-#define __OSL_SYSTEM_H__
+#ifndef INCLUDED_SAL_OSL_UNX_SYSTEM_H
+#define INCLUDED_SAL_OSL_UNX_SYSTEM_H
#include <stdio.h>
#include <stdlib.h>
@@ -411,6 +411,6 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
-#endif /* __OSL_SYSTEM_H__ */
+#endif // INCLUDED_SAL_OSL_UNX_SYSTEM_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index 3b431ad292e2..76b5e4146dfd 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_UUNXAPI_H_
-#define _OSL_UUNXAPI_H_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_H
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_H
#include <unistd.h>
#include <stdlib.h>
@@ -65,6 +65,6 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
}
#endif
-#endif /* _OSL_UUNXAPI_H_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 1a2fc4722feb..fbacb83ef69c 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_UUNXAPI_HXX_
-#define _OSL_UUNXAPI_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
#include "uunxapi.h"
@@ -62,6 +62,6 @@ namespace osl
}
} // end namespace osl
-#endif /* _OSL_UUNXAPI_HXX_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
index d31f1f842b79..483b966ff9c9 100644
--- a/sal/osl/w32/file_error.h
+++ b/sal/osl/w32/file_error.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_OSL_FILE_ERROR_H
-#define INCLUDED_OSL_FILE_ERROR_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_ERROR_H
+#define INCLUDED_SAL_OSL_W32_FILE_ERROR_H
#include "osl/file.h"
@@ -32,6 +32,6 @@ oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError);
}
#endif
-#endif /* INCLUDED_OSL_FILE_ERROR_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_ERROR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index 0115d99cf0d5..080b3ca7f93c 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_OSL_FILE_URL_H
-#define INCLUDED_OSL_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_URL_H
+#define INCLUDED_SAL_OSL_W32_FILE_URL_H
#include "sal/types.h"
#include "rtl/ustring.h"
@@ -86,6 +86,6 @@ oslFileError _osl_getFileURLFromSystemPath (
}
#endif
-#endif /* INCLUDED_OSL_FILE_URL_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_URL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index b1ceb4fc62d1..056a1ca299e8 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PATH_HELPER_H_
-#define _PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_H
#include <sal/types.h>
#include <rtl/ustring.h>
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index fc44e25df170..6092098a560e 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PATH_HELPER_HXX_
-#define _PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
#include "path_helper.h"
#include <rtl/ustring.hxx>
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 7cc383701954..b6b25113e797 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTL_STRING_CONST_H_
-#define _RTL_STRING_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
#include <limits.h>
#include <sal/types.h>
@@ -463,6 +463,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
}
#endif
-#endif /* _RTL_STRING_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 301c8a9f9b3c..fc258ead340f 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTL_STRING_UTILS_CONST_H_
-#define _RTL_STRING_UTILS_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
#include <sal/types.h>
@@ -40,6 +40,6 @@ static const sal_Int32 kErrCompareNAStringToString = -9;
}
#endif
-#endif /* _RTL_STRING_UTILS_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index 84eae3798bf1..cb7a0ab70c06 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef STRINGHELPER_HXX
-#define STRINGHELPER_HXX
+#ifndef INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
+#define INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 88df6384f362..614d906023cc 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_CONDITION_CONST_H_
-#define _OSL_CONDITION_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
+#define INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -45,6 +45,6 @@ OSLTEST_DECLARE_USTRING( TestCon, "testcondition" );
const char pTestString[17] = "Sun Microsystems";
-#endif /* _OSL_CONDITION_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 6a27c86246b8..97db12bdd446 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_FILE_CONST_H_
-#define _OSL_FILE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
+#define INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
#include <stdlib.h>
#include <stdio.h>
@@ -197,6 +197,6 @@ OSLTEST_DECLARE( VolURL6, FILE_PREFIX "e:/" );
}
#endif
-#endif /* _OSL_FILE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index f5417023b2a7..40b33218d047 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_MODULE_CONST_H_
-#define _OSL_MODULE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
+#define INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -42,6 +42,6 @@
typedef sal_Bool (* FuncPtr )( sal_Bool );
-#endif /* _OSL_MODULE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index fb6bfaa5f1eb..a5ac53ed4564 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_MUTEX_CONST_H_
-#define _OSL_MUTEX_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
+#define INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -32,6 +32,6 @@
#define BUFFER_SIZE 16
-#endif /* _OSL_MUTEX_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 17e8c1a33df7..1dfa2422e7cb 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _OSL_SECURITY_CONST_H_
-#define _OSL_SECURITY_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
+#define INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
#if ( defined WNT ) // Windows
#include <io.h>
@@ -53,6 +53,6 @@ const char pTestString[17] = "Sun Microsystems";
bool isAdmin = sal_False;
-#endif /* _OSL_SECURITY_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 1c43eaaf8a0f..4debc78d87f4 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SOCKETHELPER_HXX_
-#define _SOCKETHELPER_HXX_
+#ifndef INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
+#define INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
#include <sal/types.h>
#include <rtl/textenc.h>
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 8abffb2d7a96..132cd567519b 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTL_PROCESS_CONST_H_
-#define _RTL_PROCESS_CONST_H_
+#ifndef INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
+#define INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
#include <rtl/ustring.hxx>
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 69aa1897866e..da2ebeacc683 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RTL_ALLOC_ARENA_HXX
-#define INCLUDED_RTL_ALLOC_ARENA_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
+#define INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
#include "sal/types.h"
#include "rtl/alloc.h"
@@ -112,6 +112,6 @@ struct rtl_arena_st
*/
extern rtl_arena_type * gp_default_arena;
-#endif /* INCLUDED_RTL_ALLOC_ARENA_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/alloc_cache.hxx b/sal/rtl/alloc_cache.hxx
index 01db4b2dd1cb..1afcd4288922 100644
--- a/sal/rtl/alloc_cache.hxx
+++ b/sal/rtl/alloc_cache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RTL_ALLOC_CACHE_HXX
-#define INCLUDED_RTL_ALLOC_CACHE_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
+#define INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
#include "sal/types.h"
#include "rtl/alloc.h"
@@ -152,6 +152,6 @@ struct rtl_cache_st
rtl_cache_stat_type m_cpu_stats;
};
-#endif /* INCLUDED_RTL_ALLOC_CACHE_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_CACHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index b4d7cf495a59..57ababe7de79 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RTL_ALLOC_IMPL_HXX
-#define INCLUDED_RTL_ALLOC_IMPL_HXX
+#ifndef INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
+#define INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
#include "sal/types.h"
@@ -202,6 +202,6 @@ typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
extern AllocMode alloc_mode;
-#endif /* INCLUDED_RTL_ALLOC_IMPL_HXX */
+#endif // INCLUDED_SAL_RTL_ALLOC_IMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/hash.hxx b/sal/rtl/hash.hxx
index f9338fb4660c..5997118ca291 100644
--- a/sal/rtl/hash.hxx
+++ b/sal/rtl/hash.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RTL_SOURCE_HASH_HXX
-#define INCLUDED_RTL_SOURCE_HASH_HXX
+#ifndef INCLUDED_SAL_RTL_HASH_HXX
+#define INCLUDED_SAL_RTL_HASH_HXX
#include <sal/types.h>
#include <rtl/ustring.h>
@@ -29,6 +29,6 @@ rtl_uString *rtl_str_hash_intern (rtl_uString *pString,
int can_return);
void rtl_str_hash_remove (rtl_uString *pString);
-#endif /* INCLUDED_RTL_SOURCE_HASH_HXX */
+#endif // INCLUDED_SAL_RTL_HASH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/strimp.hxx b/sal/rtl/strimp.hxx
index e31717c39539..d7370773f477 100644
--- a/sal/rtl/strimp.hxx
+++ b/sal/rtl/strimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RTL_SOURCE_STRIMP_HXX
-#define INCLUDED_RTL_SOURCE_STRIMP_HXX
+#ifndef INCLUDED_SAL_RTL_STRIMP_HXX
+#define INCLUDED_SAL_RTL_STRIMP_HXX
#include <config_probes.h>
#if USE_SDT_PROBES
@@ -77,6 +77,6 @@ bool rtl_ImplIsWhitespace( sal_Unicode c );
# define RTL_LOG_STRING_INTERN_DELETE(s)
#endif /* USE_SDT_PROBES */
-#endif /* INCLUDED_RTL_SOURCE_STRIMP_HXX */
+#endif // INCLUDED_SAL_RTL_STRIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/surrogates.hxx b/sal/rtl/surrogates.hxx
index e06567d687de..ac47050dc594 100644
--- a/sal/rtl/surrogates.hxx
+++ b/sal/rtl/surrogates.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SAL_RTL_SOURCE_SURROGATES_HXX
-#define INCLUDED_SAL_RTL_SOURCE_SURROGATES_HXX
+#ifndef INCLUDED_SAL_RTL_SURROGATES_HXX
+#define INCLUDED_SAL_RTL_SURROGATES_HXX
#include "sal/config.h"
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index b899344142f1..de36a62d7d4f 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_SAL_WORKBEN_CLIPBOARDWBEN_TESTCOPY_XTDATAOBJECT_HXX
+#define INCLUDED_SAL_WORKBEN_CLIPBOARDWBEN_TESTCOPY_XTDATAOBJECT_HXX
/*
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx
index b4ecdf07808e..ae7e984a943d 100644
--- a/salhelper/test/rtti/samplelibrtti.hxx
+++ b/salhelper/test/rtti/samplelibrtti.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __SAMPLELIBRTTI_HXX_
-#define __SAMPLELIBRTTI_HXX_
+#ifndef INCLUDED_SALHELPER_TEST_RTTI_SAMPLELIBRTTI_HXX
+#define INCLUDED_SALHELPER_TEST_RTTI_SAMPLELIBRTTI_HXX
class MyClassA
{
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index ed1cded88dce..160e5fb3952f 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAX_ATTRLISTIMPL_HXX
-#define _SAX_ATTRLISTIMPL_HXX
+#ifndef INCLUDED_SAX_SOURCE_EXPATWRAP_ATTRLISTIMPL_HXX
+#define INCLUDED_SAX_SOURCE_EXPATWRAP_ATTRLISTIMPL_HXX
#include "sal/config.h"
#include <cppuhelper/implbase2.hxx>
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 4544fc3515e3..fbbaede5f94b 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SAX_FASTSERIALIZER_HXX
-#define SAX_FASTSERIALIZER_HXX
+#ifndef INCLUDED_SAX_SOURCE_TOOLS_FASTSERIALIZER_HXX
+#define INCLUDED_SAX_SOURCE_TOOLS_FASTSERIALIZER_HXX
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx
index 04b91b12435e..1f1dbda47830 100644
--- a/sc/source/ui/inc/FTestDialog.hxx
+++ b/sc/source/ui/inc/FTestDialog.hxx
@@ -8,8 +8,8 @@
*
*/
-#ifndef F_TEST_DIALOG_HXX
-#define F_TEST_DIALOG_HXX
+#ifndef INCLUDED_SC_SOURCE_UI_INC_FTESTDIALOG_HXX
+#define INCLUDED_SC_SOURCE_UI_INC_FTESTDIALOG_HXX
#include "StatisticsTwoVariableDialog.hxx"
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 73024e71d3e3..2f4a199c8ceb 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SOLVER_HXX
-#define SOLVER_HXX
+#ifndef INCLUDED_SCCOMP_SOURCE_SOLVER_SOLVERCOMPONENT_HXX
+#define INCLUDED_SCCOMP_SOURCE_SOLVER_SOLVERCOMPONENT_HXX
#include <com/sun/star/sheet/XSolver.hpp>
#include <com/sun/star/sheet/XSolverDescription.hpp>
diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx
index 6054f3e8ee4f..6cf1e6a9fd0a 100644
--- a/sd/source/ui/inc/createcustomanimationpanel.hxx
+++ b/sd/source/ui/inc/createcustomanimationpanel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATECUSTOMANIMATIONPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATECUSTOMANIMATIONPANEL_HXX
#include <sal/config.h>
diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx
index 89cb0976f893..e8a46c48c2d6 100644
--- a/setup_native/source/win32/customactions/tools/seterror.hxx
+++ b/setup_native/source/win32/customactions/tools/seterror.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SETERROR_HXX_
-#define _SETERROR_HXX_
+#ifndef INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_TOOLS_SETERROR_HXX
+#define INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_TOOLS_SETERROR_HXX
// list of own error codes
diff --git a/setup_native/source/win32/wintools/makecab/parseddf.h b/setup_native/source/win32/wintools/makecab/parseddf.h
index cb982ff8ce50..90f34c6e7f87 100644
--- a/setup_native/source/win32/wintools/makecab/parseddf.h
+++ b/setup_native/source/win32/wintools/makecab/parseddf.h
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __PARSEDDF_H__
-#define __PARSEDDF_H__
+#ifndef INCLUDED_SETUP_NATIVE_SOURCE_WIN32_WINTOOLS_MAKECAB_PARSEDDF_H
+#define INCLUDED_SETUP_NATIVE_SOURCE_WIN32_WINTOOLS_MAKECAB_PARSEDDF_H
#ifdef __cplusplus
extern "C" {
@@ -41,6 +41,6 @@ unsigned int ParseDdf(char * ddfFile, PCCAB vars, DDFSRCFILE ** srcListH, unsign
}
#endif
-#endif /* __PARSEDDF_H__ */
+#endif // INCLUDED_SETUP_NATIVE_SOURCE_WIN32_WINTOOLS_MAKECAB_PARSEDDF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index de381929c05d..35484fdae8cc 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
-#define INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
+#ifndef INCLUDED_SFX2_INC_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
+#define INCLUDED_SFX2_INC_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx
index 435b43b00969..92eafe9a3256 100644
--- a/sfx2/inc/sidebar/PopupContainer.hxx
+++ b/sfx2/inc/sidebar/PopupContainer.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX
-#define INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX
+#ifndef INCLUDED_SFX2_INC_SIDEBAR_POPUPCONTAINER_HXX
+#define INCLUDED_SFX2_INC_SIDEBAR_POPUPCONTAINER_HXX
#include <sfx2/dllapi.h>
#include <vcl/floatwin.hxx>
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index e03d4f8db26d..199b26a4f329 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -42,6 +42,6 @@ public:
virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-#endif // #ifndef SFX_HELPDISPATCHER_HXX
+#endif // INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 92f8af2b2d63..6c729eeccbc5 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFXMACROLOADER_HXX
-#define INCLUDED_SFXMACROLOADER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_MACROLOADER_HXX
+#define INCLUDED_SFX2_SOURCE_INC_MACROLOADER_HXX
#include <sal/config.h>
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index 39959f2eb288..59a7fbbb108c 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FIXEDVALUEBACKEND_HXX_
-#define _FIXEDVALUEBACKEND_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_LOCALEBE_LOCALEBACKEND_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_LOCALEBE_LOCALEBACKEND_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -137,6 +137,6 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 <
} ;
-#endif // _FIXEDVALUEBACKEND_HXX_
+#endif // INCLUDED_SHELL_SOURCE_BACKENDS_LOCALEBE_LOCALEBACKEND_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 62a9f5d35fc2..57d6e8333705 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FIXEDVALUEBACKEND_HXX_
-#define _FIXEDVALUEBACKEND_HXX_
+#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_WININETBE_WININETBACKEND_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_WININETBE_WININETBACKEND_HXX
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -145,6 +145,6 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 <
} ;
-#endif // _FIXEDVALUEBACKEND_HXX_
+#endif // INCLUDED_SHELL_SOURCE_BACKENDS_WININETBE_WININETBACKEND_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_getopt.h b/soltools/cpp/_getopt.h
index 8a8fccdd7eac..cb0a5008f410 100644
--- a/soltools/cpp/_getopt.h
+++ b/soltools/cpp/_getopt.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SOLTOOLS_CPP_GETOPT_H
-#define INCLUDED_SOLTOOLS_CPP_GETOPT_H
+#ifndef INCLUDED_SOLTOOLS_CPP__GETOPT_H
+#define INCLUDED_SOLTOOLS_CPP__GETOPT_H
int stgetopt(int, char *const *, const char *);
extern char *optarg;
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 4980632e2fe3..4d3c6dd79700 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef COLLECTDIRCONTENT_H
-#define COLLECTDIRCONTENT_H
+#ifndef INCLUDED_SOLTOOLS_MKDEPEND_COLLECTDIRCONTENT_HXX
+#define INCLUDED_SOLTOOLS_MKDEPEND_COLLECTDIRCONTENT_HXX
#if defined __cplusplus
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index b25fc2e7ce44..05e658509a93 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _LRU_CACHE_HXX_
-#define _LRU_CACHE_HXX_
+#ifndef INCLUDED_STOC_SOURCE_COREREFLECTION_LRUCACHE_HXX
+#define INCLUDED_STOC_SOURCE_COREREFLECTION_LRUCACHE_HXX
// __CACHE_DIAGNOSE forces cache size to 4 and works only for OUString keys
// #define __CACHE_DIAGNOSE 1
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 94b4a782b18a..da4aa2d6a154 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STOC_JAVAVM_INTERACT_HXX
-#define INCLUDED_STOC_JAVAVM_INTERACT_HXX
+#ifndef INCLUDED_STOC_SOURCE_JAVAVM_INTERACT_HXX
+#define INCLUDED_STOC_SOURCE_JAVAVM_INTERACT_HXX
#include "com/sun/star/task/XInteractionRequest.hpp"
#include "com/sun/star/uno/Any.hxx"
@@ -64,6 +64,6 @@ private:
}
-#endif // INCLUDED_STOC_JAVAVM_INTERACT_HXX
+#endif // INCLUDED_STOC_SOURCE_JAVAVM_INTERACT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index df9745031467..63683945b416 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STOC_JAVAVM_JAVAVM_HXX
-#define INCLUDED_STOC_JAVAVM_JAVAVM_HXX
+#ifndef INCLUDED_STOC_SOURCE_JAVAVM_JAVAVM_HXX
+#define INCLUDED_STOC_SOURCE_JAVAVM_JAVAVM_HXX
#include "jvmargs.hxx"
@@ -162,6 +162,6 @@ private:
}
-#endif // INCLUDED_STOC_JAVAVM_JAVAVM_HXX
+#endif // INCLUDED_STOC_SOURCE_JAVAVM_JAVAVM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/jvmargs.hxx b/stoc/source/javavm/jvmargs.hxx
index 6a5202f5ee2a..828fc51440ef 100644
--- a/stoc/source/javavm/jvmargs.hxx
+++ b/stoc/source/javavm/jvmargs.hxx
@@ -18,8 +18,8 @@
*/
-#ifndef __JVM_HXX
-#define __JVM_HXX
+#ifndef INCLUDED_STOC_SOURCE_JAVAVM_JVMARGS_HXX
+#define INCLUDED_STOC_SOURCE_JAVAVM_JVMARGS_HXX
#include <vector>
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 70f2227f3f1b..e9bf8b5c32ed 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _STOC_SEC_LRU_CACHE_H_
-#define _STOC_SEC_LRU_CACHE_H_
+#ifndef INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
+#define INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
#include <boost/unordered_map.hpp>
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index c2e394a273c0..58e7d1dbcadb 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _STOC_SEC_PERMISSIONS_H_
-#define _STOC_SEC_PERMISSIONS_H_
+#ifndef INCLUDED_STOC_SOURCE_SECURITY_PERMISSIONS_H
+#define INCLUDED_STOC_SOURCE_SECURITY_PERMISSIONS_H
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
index 3da16dbcd0bb..dff8e24cebee 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_stoc_source_uriproc_ExternalUriReferenceTranslator_hxx
-#define INCLUDED_stoc_source_uriproc_ExternalUriReferenceTranslator_hxx
+#ifndef INCLUDED_STOC_SOURCE_URIPROC_EXTERNALURIREFERENCETRANSLATOR_HXX
+#define INCLUDED_STOC_SOURCE_URIPROC_EXTERNALURIREFERENCETRANSLATOR_HXX
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index 1c48aebd17ab..b6306888ca69 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_stoc_source_uriproc_UriReference_hxx
-#define INCLUDED_stoc_source_uriproc_UriReference_hxx
+#ifndef INCLUDED_STOC_SOURCE_URIPROC_URIREFERENCE_HXX
+#define INCLUDED_STOC_SOURCE_URIPROC_URIREFERENCE_HXX
#include "com/sun/star/uno/RuntimeException.hpp"
#include "osl/mutex.hxx"
diff --git a/stoc/source/uriproc/UriReferenceFactory.hxx b/stoc/source/uriproc/UriReferenceFactory.hxx
index 4a18d502467e..cbbf2432a3dc 100644
--- a/stoc/source/uriproc/UriReferenceFactory.hxx
+++ b/stoc/source/uriproc/UriReferenceFactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_stoc_source_uriproc_UriReferenceFactory_hxx
-#define INCLUDED_stoc_source_uriproc_UriReferenceFactory_hxx
+#ifndef INCLUDED_STOC_SOURCE_URIPROC_URIREFERENCEFACTORY_HXX
+#define INCLUDED_STOC_SOURCE_URIPROC_URIREFERENCEFACTORY_HXX
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
index 01da290700ad..2d21127cb3b8 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_stoc_source_uriproc_VndSunStarPkgUrlReferenceFactory_hxx
-#define INCLUDED_stoc_source_uriproc_VndSunStarPkgUrlReferenceFactory_hxx
+#ifndef INCLUDED_STOC_SOURCE_URIPROC_VNDSUNSTARPKGURLREFERENCEFACTORY_HXX
+#define INCLUDED_STOC_SOURCE_URIPROC_VNDSUNSTARPKGURLREFERENCEFACTORY_HXX
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
index b37e18ee4993..113dbbf9a163 100644
--- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx
+++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
@@ -176,7 +176,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx
index 50f59450ece2..1cebed452ccd 100644
--- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -72,7 +72,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
index ad8c59c9dce0..bae716c80145 100644
--- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -65,7 +65,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index adcf5d47b579..bf8eee7a5645 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGDOCUMENT_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGDOCUMENT_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
#include <boost/utility.hpp>
#include <svgio/svgreader/svgnode.hxx>
@@ -81,7 +81,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGDOCUMENT_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
index 2b2b591cadee..cc6243864391 100644
--- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <svgio/svgreader/svgdocument.hxx>
@@ -67,7 +67,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx
index 655bd2c96f7f..d13ffcc90884 100644
--- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -77,7 +77,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx
index f19a3c59a200..f419a1395441 100644
--- a/svgio/inc/svgio/svgreader/svggnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGGNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -58,7 +58,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx
index 00752e6fbb92..d376848e6a0d 100644
--- a/svgio/inc/svgio/svgreader/svggradientnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -129,7 +129,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
index d5156ecce0e1..4844df28e0e1 100644
--- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -56,7 +56,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx
index fcfe4073aab2..611895b86903 100644
--- a/svgio/inc/svgio/svgreader/svgimagenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGIMAGENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGIMAGENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -88,7 +88,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGIMAGENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx
index 12036f95bcae..bba20185b67a 100644
--- a/svgio/inc/svgio/svgreader/svglinenode.hxx
+++ b/svgio/inc/svgio/svgreader/svglinenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGLINENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGLINENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -77,7 +77,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGLINENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx
index 4871009895d1..b20bf9740142 100644
--- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGMARKERNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGMARKERNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -115,7 +115,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGMARKERNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx
index c885fec3694f..1aaac2d626a3 100644
--- a/svgio/inc/svgio/svgreader/svgmasknode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGMASKNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGMASKNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -90,7 +90,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGMASKNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 679064ba58bb..e4cb348b982d 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
#include <svgio/svgreader/svgtools.hxx>
#include <svgio/svgreader/svgtoken.hxx>
@@ -165,7 +165,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgpaint.hxx b/svgio/inc/svgio/svgreader/svgpaint.hxx
index 55e82fbccf58..2e1622939efb 100644
--- a/svgio/inc/svgio/svgreader/svgpaint.hxx
+++ b/svgio/inc/svgio/svgreader/svgpaint.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGPAINT_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGPAINT_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
#include <basegfx/color/bcolor.hxx>
@@ -57,7 +57,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGPAINT_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx
index 2a2c4bd115ee..6da48d03a9c4 100644
--- a/svgio/inc/svgio/svgreader/svgpathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGPATHNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -69,7 +69,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx
index 98bb7a9efb56..cd51d3da22cf 100644
--- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -118,7 +118,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx
index a1363bf64c2a..4affd76e4f59 100644
--- a/svgio/inc/svgio/svgreader/svgpolynode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGPOLYNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGPOLYNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -70,7 +70,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGPOLYNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx
index 7fcde285c221..4ab132348480 100644
--- a/svgio/inc/svgio/svgreader/svgrectnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGRECTNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGRECTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -87,7 +87,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGRECTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 9df269852937..7aa4f5d604e8 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
#include <svgio/svgreader/svgpaint.hxx>
#include <svgio/svgreader/svgnode.hxx>
@@ -441,7 +441,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx
index b9dca8326247..11bdb645b3f0 100644
--- a/svgio/inc/svgio/svgreader/svgstylenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGSTYLENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGSTYLENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -56,7 +56,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGSTYLENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
index 07694ab7023c..7650dbdcd186 100644
--- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGSVGNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGSVGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -97,7 +97,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGSVGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
index 0e0b58ded149..8369755a9754 100644
--- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -60,7 +60,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx
index f336701a1654..4a218412d2ee 100644
--- a/svgio/inc/svgio/svgreader/svgtextnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTEXTNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTEXTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -72,7 +72,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTEXTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
index 525c0f7c3560..210fd44ee0d0 100644
--- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -78,7 +78,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
index 97528a679902..97c95fea4d25 100644
--- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
@@ -51,6 +51,6 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx
index e3f950e8efae..ef853cb211cc 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTOKEN_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTOKEN_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
#include <rtl/ustring.hxx>
#include <boost/unordered_map.hpp>
@@ -192,7 +192,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTOKEN_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx
index 8da721cf7894..58de9fe2bf7c 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTOOLS_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTOOLS_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/color/bcolor.hxx>
@@ -231,7 +231,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTOOLS_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx
index e1d936065d22..0f2187ac7035 100644
--- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTREFNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTREFNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -57,7 +57,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTREFNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx
index 14ca5b381269..10f9069f803d 100644
--- a/svgio/inc/svgio/svgreader/svgtspannode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_SVGTSPANNODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_SVGTSPANNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
#include <svgio/svgreader/svgcharacternode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -56,7 +56,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_SVGTSPANNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
// eof
diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx
index 8eb13efa4c9d..f9b945369c52 100644
--- a/svgio/inc/svgio/svgreader/svgusenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgusenode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVGIO_SVGREADER_USENODE_HXX
-#define INCLUDED_SVGIO_SVGREADER_USENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
@@ -81,7 +81,7 @@ namespace svgio
-#endif //INCLUDED_SVGIO_SVGREADER_USENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
// eof
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index 429806706b1e..a42c6a0e2d42 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_ROADMAP_HXX
-#define INCLUDED_SVTOOLS_ROADMAP_HXX
+#ifndef INCLUDED_SVTOOLS_INC_ROADMAP_HXX
+#define INCLUDED_SVTOOLS_INC_ROADMAP_HXX
#include <svtools/svtdllapi.h>
#include <vcl/ctrl.hxx>
diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
index 24945278a4c0..58aa55e4a350 100644
--- a/svtools/inc/table/defaultinputhandler.hxx
+++ b/svtools/inc/table/defaultinputhandler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX
-#define INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX
+#ifndef INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
+#define INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
#include <svtools/table/tableinputhandler.hxx>
#include <svtools/table/tabletypes.hxx>
@@ -60,6 +60,6 @@ namespace svt { namespace table
} } // namespace svt::table
-#endif // INCLUDED_SVTOOLS_TABLE_DEFAULTINPUTHANDLER_HXX
+#endif // INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index c06f0baadd15..9bd98251cff4 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX
-#define INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX
+#ifndef INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
+#define INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
#include <svtools/table/tablemodel.hxx>
@@ -116,6 +116,6 @@ namespace svt { namespace table
} } // namespace svt::table
-#endif // INCLUDED_SVTOOLS_TABLE_GRIDTABLERENDERER_HXX
+#endif // INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 4d05ee2d8371..4cf5b4c0f5fe 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX
-#define INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX
+#ifndef INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
+#define INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
#include <svtools/svtdllapi.h>
#include <svtools/table/tablemodel.hxx>
@@ -213,6 +213,6 @@ namespace svt { namespace table
} } // namespace svt::table
-#endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROL_HXX
+#endif // INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx
index 553ce4078729..080d058d607c 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX
-#define INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX
+#ifndef INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
+#define INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
#include <sal/types.h>
#include <vcl/event.hxx>
@@ -252,6 +252,6 @@ namespace svt { namespace table
} } // namespace svt::table
-#endif // INCLUDED_SVTOOLS_TABLE_TABLECONTROLINTERFACE_HXX
+#endif // INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index f163765f52c9..31abcd6fd865 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBAR_HXX
-#define INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBAR_HXX
+#ifndef INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
+#define INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
#include <svtools/headbar.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -74,6 +74,6 @@ public:
};
-#endif // INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBAR_HXX
+#endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 28b80b1e7340..144364f9f495 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBARITEM_HXX
-#define INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBARITEM_HXX
+#ifndef INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
+#define INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -109,6 +109,6 @@ public:
virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-#endif // INCLUDED_SVTOOLS_VCLXACCESSIBLEHEADERBARITEM_HXX
+#endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/hatchwindow.hxx b/svtools/source/inc/hatchwindow.hxx
index f5a9319abeb4..b08e13ee0e14 100644
--- a/svtools/source/inc/hatchwindow.hxx
+++ b/svtools/source/inc/hatchwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_HATCHWINDOW_HXX
-#define INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_HATCHWINDOW_HXX
+#ifndef INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
+#define INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
#include <com/sun/star/embed/XHatchWindow.hpp>
@@ -67,6 +67,6 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-#endif // INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_HATCHWINDOW_HXX
+#endif // INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/hatchwindowfactory.hxx b/svtools/source/inc/hatchwindowfactory.hxx
index af11bd05c03b..2875aaf77d0f 100644
--- a/svtools/source/inc/hatchwindowfactory.hxx
+++ b/svtools/source/inc/hatchwindowfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_HATCHWINDOWFACTORY_HXX
-#define INCLUDED_SVTOOLS_SOURCE_HATCHWINDOW_HATCHWINDOWFACTORY_HXX
+#ifndef INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOWFACTORY_HXX
+#define INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOWFACTORY_HXX
#endif
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 90bdaa8dd95d..58023a87db74 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_ACCESSIBLETABLESHAPE_HXX
-#define INCLUDED_SVX_ACCESSIBLETABLESHAPE_HXX
+#ifndef INCLUDED_SVX_INC_ACCESSIBLETABLESHAPE_HXX
+#define INCLUDED_SVX_INC_ACCESSIBLETABLESHAPE_HXX
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
index 7ab73fef2450..87a0db46068e 100644
--- a/svx/inc/polygn3d.hxx
+++ b/svx/inc/polygn3d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_POLYGN3D_HXX
-#define INCLUDED_SVX_POLYGN3D_HXX
+#ifndef INCLUDED_SVX_INC_POLYGN3D_HXX
+#define INCLUDED_SVX_INC_POLYGN3D_HXX
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
@@ -67,6 +67,6 @@ public:
void SetLineOnly(bool bNew);
};
-#endif // INCLUDED_SVX_POLYGN3D_HXX
+#endif // INCLUDED_SVX_INC_POLYGN3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
index 1f398abdd65c..4b9dc9947d20 100644
--- a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
#include <sal/types.h>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
@@ -60,6 +60,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
index 03b58180ceb1..979762c2b25e 100644
--- a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#define INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
#include <sal/types.h>
@@ -69,6 +69,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index 0b1bf34a384d..d8ea21f61d8c 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
-#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
#include <svx/sdr/contact/objectcontact.hxx>
@@ -139,6 +139,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
index 323df6d10a00..b375bc36e9f8 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
#include <svx/sdr/contact/viewcontactofe3d.hxx>
@@ -56,6 +56,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
index 4e7647167a92..32ac676d43ba 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
#include <svx/sdr/contact/viewcontactofe3d.hxx>
@@ -56,6 +56,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
index 572837f069e0..5d50ba58aead 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
#include <svx/sdr/contact/viewcontactofe3d.hxx>
@@ -56,6 +56,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
index e0ee21118602..18601e81f64e 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
#include <svx/sdr/contact/viewcontactofe3d.hxx>
@@ -56,6 +56,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
index 01e0d4204948..186251a03a49 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
#include <svx/sdr/contact/viewcontactofe3d.hxx>
@@ -56,6 +56,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
index b6f25e0650b3..eb4ab59f73b4 100644
--- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
#include <sal/types.h>
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -80,6 +80,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx
index 4ed308ca4eb0..6eaa25a0f1ef 100644
--- a/svx/inc/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
@@ -62,6 +62,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index e2f62c4b50e3..ebe53f785faa 100644
--- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
#include <sal/types.h>
#include <svx/sdr/contact/viewcontact.hxx>
@@ -72,6 +72,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx
index aceb6e80da24..05a80b1565d2 100644
--- a/svx/inc/sdr/contact/viewcontactofopenglobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
index d201b8957fb5..32640f9349af 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
index 919b438436e6..49212a35d35b 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
index 496f34a99450..b5ee009708bb 100644
--- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 4981e1970945..4be39aab2774 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 60142ff65db7..fbfcd43d32ff 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -60,6 +60,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
index cd8e2903dec8..66db6d6b628a 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -79,6 +79,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index 3be8aec6952b..09d96d0dab56 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
#include <sal/types.h>
#include <svx/sdr/contact/viewcontact.hxx>
@@ -298,6 +298,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
index daa37db432ee..ba44fde710ef 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index 84378f2ce8cc..b88d9f7207f3 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
@@ -87,6 +87,6 @@ namespace sdr { namespace contact {
} } // namespace sdr::contact
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index 306798bcc416..fc8cbfb93e15 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
@@ -69,6 +69,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
index b25e161dd613..013bec8af903 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -49,6 +49,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
index 7c1a6709f9c8..be90d488168d 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
@@ -68,6 +68,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
index 556aa37e12cc..19e60f51c75c 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
@@ -49,6 +49,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 2cae0aa7833a..5f6aed614595 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
#include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -52,6 +52,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
index 2abae09a3c43..6f5c8ba838c1 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index f770a341fcc0..9a3bfbeb1082 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -61,6 +61,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 01acfabbb507..bb9710583b77 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
@@ -49,6 +49,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
index 59ffc2b513d0..ca462f4c978d 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
#include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -233,6 +233,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index a1ade08cd65f..ccb1b8735685 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#ifndef INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
@@ -126,6 +126,6 @@ namespace sdr { namespace contact {
} } // namespace sdr::contact
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx
index e9a70a7e234d..12e9a2ae3e3b 100644
--- a/svx/inc/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
@@ -46,6 +46,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlayhatchrect.hxx b/svx/inc/sdr/overlay/overlayhatchrect.hxx
index e69c61b87849..d54d0679a3ad 100644
--- a/svx/inc/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/sdr/overlay/overlayhatchrect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <vcl/hatch.hxx>
@@ -66,6 +66,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
index 2e3bc1640ae7..287d0336a836 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHELPLINE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <svx/svdhlpln.hxx>
@@ -55,6 +55,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHELPLINE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
index 65b7bb58fc54..71f7aa38c8f2 100644
--- a/svx/inc/sdr/overlay/overlayline.hxx
+++ b/svx/inc/sdr/overlay/overlayline.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYLINE_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYLINE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
@@ -54,6 +54,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYLINE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 2db2cf1da96f..95448b5d0eab 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <basegfx/range/b2irange.hxx>
@@ -93,6 +93,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 7279a11bea0e..77240447a52e 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <tools/gen.hxx>
@@ -79,7 +79,7 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
// eof
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index 2d7748e8d013..2d43be42f1c1 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
@@ -70,6 +70,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index 3dab6a607f75..095c411e1d5d 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTOOLS_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTOOLS_HXX
#include <drawinglayer/primitive2d/primitivetools2d.hxx>
#include <vcl/bitmapex.hxx>
@@ -270,6 +270,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
index 30b7dd02b4e7..c1f780f4eb8e 100644
--- a/svx/inc/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/sdr/overlay/overlaytriangle.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#ifndef INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#define INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
@@ -57,6 +57,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 02d11c4ebf72..2d023b551eae 100644
--- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -74,6 +74,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 36591ed8bde7..39b490382be3 100644
--- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
@@ -63,6 +63,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index ccdc4a2c9265..b1d5cd634246 100644
--- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -84,6 +84,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 39f7c16bfd58..ce160a28abdb 100644
--- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -107,6 +107,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index b1a9bd564236..b7b22f6bcdbe 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -71,6 +71,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 67177c7c814d..480e6d82eab1 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
@@ -120,6 +120,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
index 888d1c770d80..2fcf28e09f3c 100644
--- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -65,6 +65,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index c2394e827e83..6cbaa2878817 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -75,6 +75,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
index ce8bd26de582..a8179fb53d3e 100644
--- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -67,6 +67,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
index a81aa0b12d7d..969cfd20a70c 100644
--- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
#include <vcl/bitmapex.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -44,6 +44,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 0c7453377d81..5c57140897bd 100644
--- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -76,6 +76,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index 650002181201..fa8a13f1c381 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -333,6 +333,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
index 4a7270690a1f..f0b8d8f3e635 100644
--- a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#define INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
#include <sal/types.h>
@@ -50,6 +50,6 @@ namespace drawinglayer
-#endif // INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#endif // INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx
index b93653b36cf7..e4c88d24f42e 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
#include <svx/sdr/properties/rectangleproperties.hxx>
@@ -62,6 +62,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx
index 4a8087d81d55..980ad870aa13 100644
--- a/svx/inc/sdr/properties/circleproperties.hxx
+++ b/svx/inc/sdr/properties/circleproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
#include <svx/sdr/properties/rectangleproperties.hxx>
@@ -62,6 +62,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx
index d05391aebb7b..2553fb577fde 100644
--- a/svx/inc/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/sdr/properties/connectorproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
#include <svx/sdr/properties/textproperties.hxx>
@@ -58,6 +58,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
index 95d725ec647e..ac58b4e1524e 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
#include <svx/sdr/properties/textproperties.hxx>
@@ -86,6 +86,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
index dac3f8e173ea..ba1f7ea105d9 100644
--- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
#include <svx/sdr/properties/e3dcompoundproperties.hxx>
#include <svx/svxdllapi.h>
@@ -53,6 +53,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx
index 4a5b56559cbc..f1e965efbc6a 100644
--- a/svx/inc/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
#include <svx/sdr/properties/e3dcompoundproperties.hxx>
#include <svx/svxdllapi.h>
@@ -53,6 +53,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index a92296d23bba..113989791779 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
#include <svx/sdr/properties/e3dproperties.hxx>
@@ -83,6 +83,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx
index a92596b6661f..cd381eb50728 100644
--- a/svx/inc/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
#include <svx/sdr/properties/e3dcompoundproperties.hxx>
@@ -52,6 +52,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx
index 8299f5a2955d..8a55e28aff75 100644
--- a/svx/inc/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/sdr/properties/graphicproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
#include <svx/sdr/properties/rectangleproperties.hxx>
@@ -62,6 +62,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 41a08c45168b..f5c026baa6b5 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
#include <svx/sdr/properties/defaultproperties.hxx>
@@ -116,6 +116,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index 6c4ce0e59d20..859f88e2dc9a 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
#include <sal/types.h>
@@ -63,6 +63,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx
index 0d4c0f1343e9..3eeca28a32f9 100644
--- a/svx/inc/sdr/properties/measureproperties.hxx
+++ b/svx/inc/sdr/properties/measureproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
#include <svx/sdr/properties/textproperties.hxx>
@@ -62,6 +62,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx
index 9a78025acd77..8d3e9c24afb4 100644
--- a/svx/inc/sdr/properties/oleproperties.hxx
+++ b/svx/inc/sdr/properties/oleproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
#include <svx/sdr/properties/rectangleproperties.hxx>
@@ -53,6 +53,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index 6af7debda17a..e221c0c478fd 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#define INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
#include <svx/sdr/properties/emptyproperties.hxx>
@@ -68,6 +68,6 @@ namespace sdr
-#endif // INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index b2bc406dd3b8..19683274a7cd 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SVDGLOB_HXX
-#define INCLUDED_SVX_SVDGLOB_HXX
+#ifndef INCLUDED_SVX_INC_SVDGLOB_HXX
+#define INCLUDED_SVX_INC_SVDGLOB_HXX
#include <rtl/ustring.hxx>
#include <sal/config.h>
@@ -42,6 +42,6 @@ SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
-#endif // INCLUDED_SVX_SVDGLOB_HXX
+#endif // INCLUDED_SVX_INC_SVDGLOB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx
index 644accbdc7bd..258fcdd72246 100644
--- a/svx/inc/svdoopengl.hxx
+++ b/svx/inc/svdoopengl.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVX_SVDOOPENGL_HXX
-#define INCLUDED_SVX_SVDOOPENGL_HXX
+#ifndef INCLUDED_SVX_INC_SVDOOPENGL_HXX
+#define INCLUDED_SVX_INC_SVDOOPENGL_HXX
#include <svx/svdobj.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx
index 95ebc0ff8d43..b8ba71302fd6 100644
--- a/svx/inc/sxallitm.hxx
+++ b/svx/inc/sxallitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXALLITM_HXX
-#define INCLUDED_SVX_SXALLITM_HXX
+#ifndef INCLUDED_SVX_INC_SXALLITM_HXX
+#define INCLUDED_SVX_INC_SXALLITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index e07938ca56e6..a6576c0f250e 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXCIKITM_HXX
-#define INCLUDED_SVX_SXCIKITM_HXX
+#ifndef INCLUDED_SVX_INC_SXCIKITM_HXX
+#define INCLUDED_SVX_INC_SXCIKITM_HXX
#include <svx/svddef.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx
index cff0f7914fe7..4df9bad6f1aa 100644
--- a/svx/inc/sxlayitm.hxx
+++ b/svx/inc/sxlayitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXLAYITM_HXX
-#define INCLUDED_SVX_SXLAYITM_HXX
+#ifndef INCLUDED_SVX_INC_SXLAYITM_HXX
+#define INCLUDED_SVX_INC_SXLAYITM_HXX
#include <svx/svddef.hxx>
#include <svl/stritem.hxx>
diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx
index dbf87753cf13..6b9d6e2d0ed9 100644
--- a/svx/inc/sxlogitm.hxx
+++ b/svx/inc/sxlogitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXLOGITM_HXX
-#define INCLUDED_SVX_SXLOGITM_HXX
+#ifndef INCLUDED_SVX_INC_SXLOGITM_HXX
+#define INCLUDED_SVX_INC_SXLOGITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index a74f7b6316ef..9af73fe91ae2 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXMKITM_HXX
-#define INCLUDED_SVX_SXMKITM_HXX
+#ifndef INCLUDED_SVX_INC_SXMKITM_HXX
+#define INCLUDED_SVX_INC_SXMKITM_HXX
#include <svx/svddef.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx
index 50538bbe412d..30026cd90d48 100644
--- a/svx/inc/sxmoitm.hxx
+++ b/svx/inc/sxmoitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXMOITM_HXX
-#define INCLUDED_SVX_SXMOITM_HXX
+#ifndef INCLUDED_SVX_INC_SXMOITM_HXX
+#define INCLUDED_SVX_INC_SXMOITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/inc/sxmovitm.hxx b/svx/inc/sxmovitm.hxx
index 551e51252aa4..c3bd851d4af9 100644
--- a/svx/inc/sxmovitm.hxx
+++ b/svx/inc/sxmovitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXMOVITM_HXX
-#define INCLUDED_SVX_SXMOVITM_HXX
+#ifndef INCLUDED_SVX_INC_SXMOVITM_HXX
+#define INCLUDED_SVX_INC_SXMOVITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index 789b8f952638..8843e4b37c40 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXMSITM_HXX
-#define INCLUDED_SVX_SXMSITM_HXX
+#ifndef INCLUDED_SVX_INC_SXMSITM_HXX
+#define INCLUDED_SVX_INC_SXMSITM_HXX
#include <svx/svddef.hxx>
#include <svx/sxsiitm.hxx>
diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx
index a3365b96f29c..e191d79b3228 100644
--- a/svx/inc/sxmtaitm.hxx
+++ b/svx/inc/sxmtaitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXMTAITM_HXX
-#define INCLUDED_SVX_SXMTAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXMTAITM_HXX
+#define INCLUDED_SVX_INC_SXMTAITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdynitm.hxx>
diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx
index 5249345ca7cb..7167739a1929 100644
--- a/svx/inc/sxoneitm.hxx
+++ b/svx/inc/sxoneitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXONEITM_HXX
-#define INCLUDED_SVX_SXONEITM_HXX
+#ifndef INCLUDED_SVX_INC_SXONEITM_HXX
+#define INCLUDED_SVX_INC_SXONEITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/inc/sxonitm.hxx b/svx/inc/sxonitm.hxx
index c709deaff94e..f65248e6e61e 100644
--- a/svx/inc/sxonitm.hxx
+++ b/svx/inc/sxonitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXONITM_HXX
-#define INCLUDED_SVX_SXONITM_HXX
+#ifndef INCLUDED_SVX_INC_SXONITM_HXX
+#define INCLUDED_SVX_INC_SXONITM_HXX
#include <svx/svddef.hxx>
#include <svl/stritem.hxx>
diff --git a/svx/inc/sxopitm.hxx b/svx/inc/sxopitm.hxx
index 72bd6ec99be4..706a778a4c66 100644
--- a/svx/inc/sxopitm.hxx
+++ b/svx/inc/sxopitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXOPITM_HXX
-#define INCLUDED_SVX_SXOPITM_HXX
+#ifndef INCLUDED_SVX_INC_SXOPITM_HXX
+#define INCLUDED_SVX_INC_SXOPITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdynitm.hxx>
diff --git a/svx/inc/sxraitm.hxx b/svx/inc/sxraitm.hxx
index 57a14d61c0e6..d1dfc6a85f6c 100644
--- a/svx/inc/sxraitm.hxx
+++ b/svx/inc/sxraitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXRAITM_HXX
-#define INCLUDED_SVX_SXRAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXRAITM_HXX
+#define INCLUDED_SVX_INC_SXRAITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx
index 9dd78ac68682..065759f284f8 100644
--- a/svx/inc/sxreaitm.hxx
+++ b/svx/inc/sxreaitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXREAITM_HXX
-#define INCLUDED_SVX_SXREAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXREAITM_HXX
+#define INCLUDED_SVX_INC_SXREAITM_HXX
#include <svx/svddef.hxx>
diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx
index 2d664a1b57b2..3483d4b20a69 100644
--- a/svx/inc/sxreoitm.hxx
+++ b/svx/inc/sxreoitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXREOITM_HXX
-#define INCLUDED_SVX_SXREOITM_HXX
+#ifndef INCLUDED_SVX_INC_SXREOITM_HXX
+#define INCLUDED_SVX_INC_SXREOITM_HXX
#include <svx/svddef.hxx>
diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx
index 25258b623a51..48d1399ad299 100644
--- a/svx/inc/sxroaitm.hxx
+++ b/svx/inc/sxroaitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXROAITM_HXX
-#define INCLUDED_SVX_SXROAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXROAITM_HXX
+#define INCLUDED_SVX_INC_SXROAITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxrooitm.hxx b/svx/inc/sxrooitm.hxx
index 91d594821cec..79f4789fe34e 100644
--- a/svx/inc/sxrooitm.hxx
+++ b/svx/inc/sxrooitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXROOITM_HXX
-#define INCLUDED_SVX_SXROOITM_HXX
+#ifndef INCLUDED_SVX_INC_SXROOITM_HXX
+#define INCLUDED_SVX_INC_SXROOITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx
index b86ca3349a71..5359921d67c5 100644
--- a/svx/inc/sxsaitm.hxx
+++ b/svx/inc/sxsaitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXSAITM_HXX
-#define INCLUDED_SVX_SXSAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXSAITM_HXX
+#define INCLUDED_SVX_INC_SXSAITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxsalitm.hxx b/svx/inc/sxsalitm.hxx
index fe5f665444c3..e6b14ece3b1f 100644
--- a/svx/inc/sxsalitm.hxx
+++ b/svx/inc/sxsalitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXSALITM_HXX
-#define INCLUDED_SVX_SXSALITM_HXX
+#ifndef INCLUDED_SVX_INC_SXSALITM_HXX
+#define INCLUDED_SVX_INC_SXSALITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxsoitm.hxx b/svx/inc/sxsoitm.hxx
index 1a63c9305ae6..0256b82587a5 100644
--- a/svx/inc/sxsoitm.hxx
+++ b/svx/inc/sxsoitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXSOITM_HXX
-#define INCLUDED_SVX_SXSOITM_HXX
+#ifndef INCLUDED_SVX_INC_SXSOITM_HXX
+#define INCLUDED_SVX_INC_SXSOITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdangitm.hxx>
diff --git a/svx/inc/sxtraitm.hxx b/svx/inc/sxtraitm.hxx
index 59bb5970ef45..f741d8c09741 100644
--- a/svx/inc/sxtraitm.hxx
+++ b/svx/inc/sxtraitm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SXTRAITM_HXX
-#define INCLUDED_SVX_SXTRAITM_HXX
+#ifndef INCLUDED_SVX_INC_SXTRAITM_HXX
+#define INCLUDED_SVX_INC_SXTRAITM_HXX
#include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index c08818542dc6..45a4b10d1a25 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -18,6 +18,7 @@
*/
#ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_CHILDRENMANAGERIMPL_HXX
+#define INCLUDED_SVX_SOURCE_ACCESSIBILITY_CHILDRENMANAGERIMPL_HXX
#include <svx/IAccessibleViewForwarderListener.hxx>
#include <svx/IAccessibleParent.hxx>
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 9990edb0a5c5..b4fa3c008e2e 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVXPIXELACCESSIBLECONTEXT_HXX
-#define _SVXPIXELACCESSIBLECONTEXT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SVXPIXELCTLACCESSIBLECONTEXT_HXX
+#define INCLUDED_SVX_SOURCE_INC_SVXPIXELCTLACCESSIBLECONTEXT_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx
index 79b781c21ad4..8a26d821f1e4 100644
--- a/svx/source/sidebar/ColorPanel.hxx
+++ b/svx/source/sidebar/ColorPanel.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVX_SIDEBAR_COLOR_PANEL_HXX
-#define SVX_SIDEBAR_COLOR_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_COLORPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_COLORPANEL_HXX
#include <svtools/valueset.hxx>
#include <vcl/window.hxx>
diff --git a/svx/source/sidebar/debug/ColorPanel.hxx b/svx/source/sidebar/debug/ColorPanel.hxx
index 9ecf6834abc4..c297c5bf7acd 100644
--- a/svx/source/sidebar/debug/ColorPanel.hxx
+++ b/svx/source/sidebar/debug/ColorPanel.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVX_SIDEBAR_COLOR_PANEL_HXX
-#define SVX_SIDEBAR_COLOR_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_COLORPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_COLORPANEL_HXX
#include <svtools/valueset.hxx>
#include <vcl/window.hxx>
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx
index a60a919c0f3e..82a47f41a1fe 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_DOCSETTING_HXX
-#define INCLUDED_SW_INC_DOCSETTING_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTSETTINGMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTSETTINGMANAGER_HXX
#include <IDocumentSettingAccess.hxx>
class SwDoc;
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index aef04f8c9510..0b0ca68d3080 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_testtools_source_bridgetest_multi_hxx
-#define INCLUDED_testtools_source_bridgetest_multi_hxx
+#ifndef INCLUDED_TESTTOOLS_SOURCE_BRIDGETEST_MULTI_HXX
+#define INCLUDED_TESTTOOLS_SOURCE_BRIDGETEST_MULTI_HXX
#include "sal/config.h"
diff --git a/toolkit/inc/helper/accessibilityclient.hxx b/toolkit/inc/helper/accessibilityclient.hxx
index 26d6f56df8a3..69d2761c36e4 100644
--- a/toolkit/inc/helper/accessibilityclient.hxx
+++ b/toolkit/inc/helper/accessibilityclient.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
-#define INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
+#ifndef INCLUDED_TOOLKIT_INC_HELPER_ACCESSIBILITYCLIENT_HXX
+#define INCLUDED_TOOLKIT_INC_HELPER_ACCESSIBILITYCLIENT_HXX
#include <toolkit/helper/accessiblefactory.hxx>
@@ -52,6 +52,6 @@ namespace toolkit
} // namespace toolkit
-#endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
+#endif // INCLUDED_TOOLKIT_INC_HELPER_ACCESSIBILITYCLIENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/helper/imagealign.hxx b/toolkit/inc/helper/imagealign.hxx
index 7b063c9a14d5..60ade5d36580 100644
--- a/toolkit/inc/helper/imagealign.hxx
+++ b/toolkit/inc/helper/imagealign.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
-#define INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#ifndef INCLUDED_TOOLKIT_INC_HELPER_IMAGEALIGN_HXX
+#define INCLUDED_TOOLKIT_INC_HELPER_IMAGEALIGN_HXX
#include <sal/types.h>
#include <vcl/button.hxx>
@@ -48,6 +48,6 @@ namespace toolkit
} // namespace toolkit
-#endif // INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#endif // INCLUDED_TOOLKIT_INC_HELPER_IMAGEALIGN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/helper/tkresmgr.hxx b/toolkit/inc/helper/tkresmgr.hxx
index 668a1bdaf186..80ac107dd4fd 100644
--- a/toolkit/inc/helper/tkresmgr.hxx
+++ b/toolkit/inc/helper/tkresmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
-#define INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
+#ifndef INCLUDED_TOOLKIT_INC_HELPER_TKRESMGR_HXX
+#define INCLUDED_TOOLKIT_INC_HELPER_TKRESMGR_HXX
#include <rtl/ustring.hxx>
@@ -30,6 +30,6 @@ namespace TkResMgr
};
-#endif // INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
+#endif // INCLUDED_TOOLKIT_INC_HELPER_TKRESMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 12ee104a1338..703ede2d7275 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
-#define INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
+#ifndef INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX
+#define INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX
#include <toolkit/dllapi.h>
#include <cppuhelper/propshlp.hxx>
@@ -52,6 +52,6 @@ public:
-#endif // INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
+#endif // INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
index e62075d4f7cf..ee967e63dfed 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
-#define INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
+#ifndef INCLUDED_TOOLKIT_INC_HELPER_UNOWRAPPER_HXX
+#define INCLUDED_TOOLKIT_INC_HELPER_UNOWRAPPER_HXX
#include <com/sun/star/awt/XToolkit.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
@@ -81,6 +81,6 @@ private:
virtual ~UnoWrapper();
};
-#endif // INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
+#endif // INCLUDED_TOOLKIT_INC_HELPER_UNOWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 93f1096dfc95..d677bcd8b0ac 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _POLY_H
-#define _POLY_H
+#ifndef INCLUDED_TOOLS_INC_POLY_H
+#define INCLUDED_TOOLS_INC_POLY_H
#include <sal/types.h>
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 610867372b03..c12ca2b781d6 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -29,10 +29,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/ucb/XSourceInitialization.hpp>
-
-#ifndef __com_sun_star_lang_DisposedException_idl__
#include <com/sun/star/lang/DisposedException.hpp>
-#endif
#include <com/sun/star/ucb/XDynamicResultSetListener.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 4ae32ecedd84..73c228c7854a 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _WEBDAV_UCP_CONTENTPROPERTIES_HXX
-#define _WEBDAV_UCP_CONTENTPROPERTIES_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_CONTENTPROPERTIES_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_CONTENTPROPERTIES_HXX
#include <config_lgpl.h>
#include <memory>
@@ -220,6 +220,6 @@ public:
} // namespace webdav_ucp
-#endif /* !_WEBDAV_UCP_CONTENTPROPERTIES_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_CONTENTPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
index 4971a797ca2f..1e44f59bd3ff 100644
--- a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DAVAUTHLISTENER_HXX_
-#define _DAVAUTHLISTENER_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVAUTHLISTENER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVAUTHLISTENER_HXX
#include <config_lgpl.h>
#include <salhelper/simplereferenceobject.hxx>
@@ -51,6 +51,6 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject
} // namespace webdav_ucp
-#endif // _DAVAUTHLISTENER_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVAUTHLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
index b87101138790..c0c5e0082c75 100644
--- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVAUTHLISTENERIMPL_HXX_
-#define _DAVAUTHLISTENERIMPL_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVAUTHLISTENERIMPL_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVAUTHLISTENERIMPL_HXX
#include <config_lgpl.h>
#include "DAVAuthListener.hxx"
diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx
index 08af59e2fcd2..a9e09b00bfc4 100644
--- a/ucb/source/ucp/webdav-neon/DAVException.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVException.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVEXCEPTION_HXX_
-#define _DAVEXCEPTION_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVEXCEPTION_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVEXCEPTION_HXX
#include <config_lgpl.h>
#include <rtl/ustring.hxx>
@@ -165,6 +165,6 @@ class DAVException : public std::exception
} // namespace webdav_ucp
-#endif // _DAVEXCEPTION_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVEXCEPTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx
index f80001165245..2064a83b4726 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DAVPROPERTIES_HXX_
-#define _DAVPROPERTIES_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVPROPERTIES_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVPROPERTIES_HXX
#include <config_lgpl.h>
#include <rtl/ustring.hxx>
@@ -63,6 +63,6 @@ struct DAVProperties
} // namespace webdav_ucp
-#endif // _DAVPROPERTIES_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVPROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx
index 72a18b3a84fe..7e5ae0fb5bb4 100644
--- a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DAVREQUESTENVIRONMENT_HXX_
-#define _DAVREQUESTENVIRONMENT_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVREQUESTENVIRONMENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVREQUESTENVIRONMENT_HXX
#include <config_lgpl.h>
#include <vector>
@@ -61,6 +61,6 @@ DAVRequestEnvironment( const OUString & rRequestURI,
} // namespace webdav_ucp
-#endif // _DAVREQUESTENVIRONMENT_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVREQUESTENVIRONMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx
index d08039331a80..98e3488a50a8 100644
--- a/ucb/source/ucp/webdav-neon/DAVResource.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVRESOURCE_HXX_
-#define _DAVRESOURCE_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCE_HXX
#include <config_lgpl.h>
#include <vector>
@@ -66,6 +66,6 @@ struct DAVResourceInfo
} // namespace webdav_ucp
-#endif // _DAVRESOURCE_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index a82ecd52ddf3..e06d16f74428 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVRESOURCEACCESS_HXX_
-#define _DAVRESOURCEACCESS_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCEACCESS_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCEACCESS_HXX
#include <config_lgpl.h>
#include <vector>
@@ -256,6 +256,6 @@ private:
} // namespace webdav_ucp
-#endif // _DAVRESOURCEACCESS_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVRESOURCEACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 5065a01d5092..1c8864ad019e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVSESSION_HXX_
-#define _DAVSESSION_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSION_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSION_HXX
#include <config_lgpl.h>
#include <memory>
@@ -220,6 +220,6 @@ private:
} // namespace webdav_ucp
-#endif // _DAVSESSION_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index 33def34583d9..b9e561379ffb 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DAVSESSIONFACTORY_HXX_
-#define _DAVSESSIONFACTORY_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSIONFACTORY_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSIONFACTORY_HXX
#ifdef min
#undef min // GNU libstdc++ <memory> includes <limit> which defines methods called min...
@@ -84,6 +84,6 @@ private:
} // namespace webdav_ucp
-#endif // _DAVSESSIONFACTORY_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVSESSIONFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
index 94483adb4452..2bf20c8aed3d 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _DAVTYPES_HXX_
-#define _DAVTYPES_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVTYPES_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVTYPES_HXX
#include <config_lgpl.h>
#include <rtl/ustring.hxx>
@@ -84,6 +84,6 @@ struct ProppatchValue
} // namespace webdav_ucp
-#endif // _DAVTYPES_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DAVTYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
index 95035206cf27..5a00d8e497f9 100644
--- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _WEBDAV_DATETIME_HELPER_HXX
-#define _WEBDAV_DATETIME_HELPER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DATETIMEHELPER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_DATETIMEHELPER_HXX
#include <config_lgpl.h>
#include <sal/types.h>
diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx
index e27093689a5a..d0228d93d178 100644
--- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx
+++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _LINKSEQUENCE_HXX_
-#define _LINKSEQUENCE_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LINKSEQUENCE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LINKSEQUENCE_HXX
#include <rtl/string.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -49,6 +49,6 @@ public:
}
-#endif /* _LINKSEQUENCE_HXX_ */
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LINKSEQUENCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx
index 62556e11c01b..9536428db10d 100644
--- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx
+++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _LOCKENTRYSEQUENCE_HXX_
-#define _LOCKENTRYSEQUENCE_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKENTRYSEQUENCE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKENTRYSEQUENCE_HXX
#include <rtl/string.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -46,6 +46,6 @@ public:
}
-#endif /* _LOCKENTRYSEQUENCE_HXX_ */
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKENTRYSEQUENCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx
index a0083b418025..acecb259d910 100644
--- a/ucb/source/ucp/webdav-neon/LockSequence.hxx
+++ b/ucb/source/ucp/webdav-neon/LockSequence.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _LOCKSEQUENCE_HXX_
-#define _LOCKSEQUENCE_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKSEQUENCE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKSEQUENCE_HXX
#include <config_lgpl.h>
#include <rtl/string.hxx>
@@ -47,6 +47,6 @@ public:
}
-#endif /* _LOCKSEQUENCE_HXX_ */
+#endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKSEQUENCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx
index bb1a495ed47f..06a28af03326 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _NEONHEADREQUEST_HXX_
-#define _NEONHEADREQUEST_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_NEONHEADREQUEST_HXX
+#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_NEONHEADREQUEST_HXX
#include <config_lgpl.h>
#include <vector>