[Libreoffice-commits] core.git: animations/source avmedia/inc avmedia/source basegfx/source bridges/inc bridges/source chart2/inc chart2/source cli_ure/source connectivity/source cppcanvas/source crashrep/source cui/source dtrans/source dtrans/test embeddedobj/source embeddedobj/test embedserv/source extensions/source fpicker/source framework/inc framework/source i18npool/inc i18npool/source i18nutil/source idl/inc include/comphelper include/svl include/systools include/test include/vbahelper include/vcl include/wntgcci include/wntgccx include/xmloff jvmfwk/plugins jvmfwk/source l10ntools/inc o3tl/qa oox/inc pyuno/inc pyuno/source registry/source registry/test rsc/inc rsc/source sal/android salhelper/test sal/inc sal/osl sal/qa sal/rtl sal/workben sax/source sccomp/source sc/source sd/source setup_native/source sfx2/inc sfx2/source shell/source soltools/cpp soltools/mkdepend stoc/source svgio/inc svtools/inc svtools/source svx/inc svx/source sw/source testtools/source toolkit/inc tools/inc ucb/so urce vcl/generic vcl/inc vcl/osx vcl/source vcl/unx winaccessibility/inc xmlscript/source xmlsecurity/inc
Thomas Arnhold
thomas at arnhold.org
Thu May 15 05:51:21 PDT 2014
animations/source/animcore/factreg.hxx | 4 ++--
avmedia/inc/mediacontrol.hxx | 4 ++--
avmedia/source/framework/soundhandler.hxx | 6 +++---
avmedia/source/gstreamer/gstcommon.hxx | 4 ++--
avmedia/source/gstreamer/gstframegrabber.hxx | 6 +++---
avmedia/source/gstreamer/gstmanager.hxx | 6 +++---
avmedia/source/gstreamer/gstplayer.hxx | 6 +++---
avmedia/source/gstreamer/gstwindow.hxx | 6 +++---
avmedia/source/inc/mediamisc.hxx | 4 ++--
avmedia/source/opengl/oglframegrabber.hxx | 6 +++---
avmedia/source/opengl/oglmanager.hxx | 6 +++---
avmedia/source/opengl/oglplayer.hxx | 6 +++---
avmedia/source/opengl/oglwindow.hxx | 6 +++---
avmedia/source/quicktime/framegrabber.hxx | 6 +++---
avmedia/source/quicktime/manager.hxx | 6 +++---
avmedia/source/quicktime/player.hxx | 6 +++---
avmedia/source/quicktime/quicktimecommon.hxx | 6 ++----
avmedia/source/quicktime/window.hxx | 6 +++---
avmedia/source/viewer/mediaevent_impl.hxx | 4 ++--
avmedia/source/viewer/mediawindow_impl.hxx | 4 ++--
avmedia/source/vlc/vlccommon.hxx | 4 ++--
avmedia/source/vlc/vlcframegrabber.hxx | 6 +++---
avmedia/source/vlc/vlcmanager.hxx | 4 ++--
avmedia/source/vlc/vlcplayer.hxx | 4 ++--
avmedia/source/vlc/vlcwindow.hxx | 6 +++---
avmedia/source/vlc/wrapper/Common.hxx | 4 ++--
avmedia/source/vlc/wrapper/EventHandler.hxx | 6 +++---
avmedia/source/vlc/wrapper/EventManager.hxx | 4 ++--
avmedia/source/vlc/wrapper/Instance.hxx | 4 ++--
avmedia/source/vlc/wrapper/Media.hxx | 4 ++--
avmedia/source/vlc/wrapper/Player.hxx | 4 ++--
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 4 ++--
avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx | 6 +++---
avmedia/source/vlc/wrapper/Types.hxx | 6 +++---
avmedia/source/win/framegrabber.hxx | 6 +++---
avmedia/source/win/interface.hxx | 4 ++--
avmedia/source/win/manager.hxx | 6 +++---
avmedia/source/win/player.hxx | 6 +++---
avmedia/source/win/wincommon.hxx | 4 ++--
avmedia/source/win/window.hxx | 6 +++---
basegfx/source/inc/hommatrixtemplate.hxx | 6 +++---
basegfx/source/inc/stringconversiontools.hxx | 6 +++---
basegfx/source/workbench/bezierclip.hxx | 6 +++---
bridges/inc/bridges/cpp_uno/bridge.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/bridge.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/types.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4 ++--
bridges/inc/bridges/cpp_uno/shared/vtables.hxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx | 6 +++---
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx | 6 +++---
bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx | 4 ++--
bridges/source/cpp_uno/mingw_x86-64/abi.hxx | 6 +++---
bridges/source/cpp_uno/mingw_x86-64/callvirtualmethod.hxx | 4 ++--
bridges/source/jni_uno/jni_base.h | 4 ++--
bridges/source/jni_uno/jni_helper.h | 4 ++--
bridges/source/jni_uno/jni_info.h | 4 ++--
chart2/inc/ChartModel.hxx | 4 ++--
chart2/inc/ChartView.hxx | 4 ++--
chart2/inc/unonames.hxx | 4 ++--
chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx | 4 ++--
chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx | 4 ++--
chart2/source/controller/dialogs/dlg_PropertyMapping.hxx | 4 ++--
chart2/source/controller/inc/res_LegendPosition.hxx | 4 ++--
chart2/source/controller/inc/res_Titles.hxx | 4 ++--
chart2/source/inc/GL3DHelper.hxx | 4 ++--
chart2/source/inc/RegressionCalculationHelper.hxx | 6 +++---
chart2/source/model/template/GL3DBarChartType.hxx | 4 ++--
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 4 ++--
chart2/source/view/charttypes/NetChart.hxx | 4 ++--
chart2/source/view/inc/GL3DBarChart.hxx | 4 ++--
chart2/source/view/inc/GL3DPlotterBase.hxx | 4 ++--
chart2/source/view/inc/GL3DRenderer.hxx | 4 ++--
chart2/source/view/inc/StaticGeometry.h | 4 ++--
chart2/source/view/main/DummyXShape.hxx | 4 ++--
cli_ure/source/uno_bridge/cli_base.h | 4 ++--
cli_ure/source/uno_bridge/cli_bridge.h | 4 ++--
cli_ure/source/uno_bridge/cli_environment.h | 4 ++--
cli_ure/source/uno_bridge/cli_proxy.h | 4 ++--
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 6 +++---
connectivity/source/inc/java/util/Property.hxx | 6 +++---
cppcanvas/source/inc/action.hxx | 6 +++---
cppcanvas/source/inc/canvasgraphichelper.hxx | 6 +++---
cppcanvas/source/inc/implrenderer.hxx | 6 +++---
cppcanvas/source/inc/outdevstate.hxx | 6 +++---
cppcanvas/source/inc/tools.hxx | 6 +++---
cppcanvas/source/mtfrenderer/bitmapaction.hxx | 6 +++---
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx | 6 +++---
cppcanvas/source/mtfrenderer/lineaction.hxx | 6 +++---
cppcanvas/source/mtfrenderer/mtftools.hxx | 6 +++---
cppcanvas/source/mtfrenderer/pointaction.hxx | 6 +++---
cppcanvas/source/mtfrenderer/polypolyaction.hxx | 6 +++---
cppcanvas/source/mtfrenderer/textaction.hxx | 6 +++---
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx | 6 +++---
cppcanvas/source/uno/uno_mtfrenderer.hxx | 4 ++--
cppcanvas/source/wrapper/implbitmap.hxx | 6 +++---
cppcanvas/source/wrapper/implbitmapcanvas.hxx | 6 +++---
cppcanvas/source/wrapper/implcanvas.hxx | 6 +++---
cppcanvas/source/wrapper/implcolor.hxx | 6 +++---
cppcanvas/source/wrapper/implcustomsprite.hxx | 6 +++---
cppcanvas/source/wrapper/implfont.hxx | 6 +++---
cppcanvas/source/wrapper/implpolypolygon.hxx | 6 +++---
cppcanvas/source/wrapper/implsprite.hxx | 6 +++---
cppcanvas/source/wrapper/implspritecanvas.hxx | 6 +++---
crashrep/source/win32/base64.h | 6 +++---
cui/source/dialogs/SpellAttrib.hxx | 4 ++--
dtrans/source/cnttype/mcnttfactory.hxx | 4 ++--
dtrans/source/cnttype/mcnttype.hxx | 4 ++--
dtrans/source/generic/clipboardmanager.hxx | 4 ++--
dtrans/source/generic/generic_clipboard.hxx | 4 ++--
dtrans/source/inc/DtObjFactory.hxx | 4 ++--
dtrans/source/win32/clipb/APNDataObject.hxx | 4 ++--
dtrans/source/win32/clipb/MtaOleClipb.hxx | 4 ++--
dtrans/source/win32/clipb/WinClipbImpl.hxx | 4 ++--
dtrans/source/win32/clipb/WinClipboard.hxx | 4 ++--
dtrans/source/win32/dnd/globals.hxx | 4 ++--
dtrans/source/win32/dnd/idroptarget.hxx | 4 ++--
dtrans/source/win32/dnd/source.hxx | 4 ++--
dtrans/source/win32/dnd/sourcecontext.hxx | 4 ++--
dtrans/source/win32/dnd/target.hxx | 4 ++--
dtrans/source/win32/dnd/targetdragcontext.hxx | 4 ++--
dtrans/source/win32/dnd/targetdropcontext.hxx | 4 ++--
dtrans/source/win32/dtobj/APNDataObject.hxx | 4 ++--
dtrans/source/win32/dtobj/DOTransferable.hxx | 4 ++--
dtrans/source/win32/dtobj/DTransHelper.hxx | 4 ++--
dtrans/source/win32/dtobj/DataFmtTransl.hxx | 4 ++--
dtrans/source/win32/dtobj/Fetc.hxx | 4 ++--
dtrans/source/win32/dtobj/FetcList.hxx | 4 ++--
dtrans/source/win32/dtobj/FmtFilter.hxx | 4 ++--
dtrans/source/win32/dtobj/MimeAttrib.hxx | 4 ++--
dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 4 ++--
dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 4 ++--
dtrans/source/win32/dtobj/XTDataObject.hxx | 4 ++--
dtrans/source/win32/ftransl/ftransl.hxx | 4 ++--
dtrans/source/win32/misc/ImplHelper.hxx | 4 ++--
dtrans/source/win32/misc/WinClip.hxx | 4 ++--
dtrans/source/win32/workbench/XTDo.hxx | 4 ++--
dtrans/test/win32/dnd/atlwindow.hxx | 4 ++--
dtrans/test/win32/dnd/sourcelistener.hxx | 4 ++--
dtrans/test/win32/dnd/targetlistener.hxx | 4 ++--
dtrans/test/win32/dnd/transferable.hxx | 4 ++--
embeddedobj/source/inc/commonembobj.hxx | 4 ++--
embeddedobj/source/inc/dummyobject.hxx | 4 ++--
embeddedobj/source/inc/oleembobj.hxx | 4 ++--
embeddedobj/source/inc/specialobject.hxx | 4 ++--
embeddedobj/source/msole/olecomponent.hxx | 4 ++--
embeddedobj/source/msole/ownview.hxx | 4 ++--
embeddedobj/source/msole/platform.h | 4 ++--
embeddedobj/test/mtexecutor/bitmapcreator.hxx | 4 ++--
embeddedobj/test/mtexecutor/mainthreadexecutor.hxx | 4 ++--
embedserv/source/inc/common.h | 4 ++--
embedserv/source/inc/embeddoc.hxx | 6 +++---
embedserv/source/inc/embeddocaccess.hxx | 4 ++--
embedserv/source/inc/embservconst.h | 4 ++--
embedserv/source/inc/iipaobj.hxx | 4 ++--
embedserv/source/inc/servprov.hxx | 4 ++--
embedserv/source/inc/xwin.hxx | 4 ++--
embedserv/source/inprocserv/inprocembobj.h | 4 ++--
embedserv/source/inprocserv/smartpointer.hxx | 4 ++--
extensions/source/ole/unoconversionutilities.hxx | 4 ++--
fpicker/source/aqua/AquaFilePickerDelegate.hxx | 4 ++--
fpicker/source/aqua/CFStringUtilities.hxx | 6 +++---
fpicker/source/aqua/ControlHelper.hxx | 6 +++---
fpicker/source/aqua/FPServiceInfo.hxx | 4 ++--
fpicker/source/aqua/FilterHelper.hxx | 6 +++---
fpicker/source/aqua/NSString_OOoAdditions.hxx | 6 +++---
fpicker/source/aqua/NSURL_OOoAdditions.hxx | 4 ++--
fpicker/source/aqua/SalAquaConstants.h | 6 +++---
fpicker/source/aqua/SalAquaFilePicker.hxx | 6 +++---
fpicker/source/aqua/SalAquaFolderPicker.hxx | 6 +++---
fpicker/source/aqua/SalAquaPicker.hxx | 4 ++--
fpicker/source/aqua/resourceprovider.hxx | 4 ++--
fpicker/source/office/OfficeControlAccess.hxx | 6 +++---
fpicker/source/office/OfficeFilePicker.hxx | 6 +++---
fpicker/source/office/OfficeFolderPicker.hxx | 6 +++---
fpicker/source/office/PlacesListBox.hxx | 4 ++--
fpicker/source/office/QueryFolderName.hxx | 6 +++---
fpicker/source/office/asyncfilepicker.hxx | 6 +++---
fpicker/source/office/commonpicker.hxx | 6 +++---
fpicker/source/office/fpinteraction.hxx | 6 +++---
fpicker/source/office/fpsmartcontent.hxx | 6 +++---
fpicker/source/office/fpsofficeResMgr.hxx | 4 ++--
fpicker/source/office/iodlg.hxx | 6 +++---
fpicker/source/office/iodlgimp.hxx | 6 +++---
fpicker/source/office/pickercallbacks.hxx | 6 +++---
fpicker/source/win32/filepicker/FPServiceInfo.hxx | 4 ++--
fpicker/source/win32/filepicker/FileOpenDlg.hxx | 4 ++--
fpicker/source/win32/filepicker/FilePicker.hxx | 4 ++--
fpicker/source/win32/filepicker/FilterContainer.hxx | 4 ++--
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx | 6 +++---
fpicker/source/win32/filepicker/PreviewCtrl.hxx | 4 ++--
fpicker/source/win32/filepicker/VistaFilePicker.hxx | 6 +++---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 6 +++---
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 6 +++---
fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 4 ++--
fpicker/source/win32/filepicker/asynceventnotifier.hxx | 4 ++--
fpicker/source/win32/filepicker/asyncrequests.hxx | 6 +++---
fpicker/source/win32/filepicker/comptr.hxx | 4 ++--
fpicker/source/win32/filepicker/controlaccess.hxx | 4 ++--
fpicker/source/win32/filepicker/controlcommand.hxx | 4 ++--
fpicker/source/win32/filepicker/controlcommandrequest.hxx | 4 ++--
fpicker/source/win32/filepicker/controlcommandresult.hxx | 4 ++--
fpicker/source/win32/filepicker/customcontrol.hxx | 4 ++--
fpicker/source/win32/filepicker/customcontrolcontainer.hxx | 4 ++--
fpicker/source/win32/filepicker/customcontrolfactory.hxx | 4 ++--
fpicker/source/win32/filepicker/dialogcustomcontrols.hxx | 4 ++--
fpicker/source/win32/filepicker/dibpreview.hxx | 4 ++--
fpicker/source/win32/filepicker/eventnotification.hxx | 4 ++--
fpicker/source/win32/filepicker/filepickereventnotification.hxx | 4 ++--
fpicker/source/win32/filepicker/filepickerstate.hxx | 4 ++--
fpicker/source/win32/filepicker/getfilenamewrapper.hxx | 4 ++--
fpicker/source/win32/filepicker/helppopupwindow.hxx | 4 ++--
fpicker/source/win32/filepicker/platform_vista.h | 4 ++--
fpicker/source/win32/filepicker/platform_xp.h | 4 ++--
fpicker/source/win32/filepicker/previewadapter.hxx | 4 ++--
fpicker/source/win32/filepicker/previewbase.hxx | 4 ++--
fpicker/source/win32/filepicker/shared.hxx | 4 ++--
fpicker/source/win32/filepicker/vistatypes.h | 6 +++---
fpicker/source/win32/folderpicker/FOPServiceInfo.hxx | 4 ++--
fpicker/source/win32/folderpicker/FolderPicker.hxx | 4 ++--
fpicker/source/win32/folderpicker/FopEvtDisp.hxx | 4 ++--
fpicker/source/win32/folderpicker/MtaFop.hxx | 4 ++--
fpicker/source/win32/folderpicker/WinFOPImpl.hxx | 4 ++--
fpicker/source/win32/misc/WinImplHelper.hxx | 4 ++--
fpicker/source/win32/misc/resourceprovider.hxx | 4 ++--
framework/inc/interaction/quietinteraction.hxx | 2 +-
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 6 +++---
framework/source/inc/dispatch/windowcommanddispatch.hxx | 2 +-
i18npool/inc/breakiteratorImpl.hxx | 6 +++---
i18npool/inc/breakiterator_cjk.hxx | 6 +++---
i18npool/inc/breakiterator_ctl.hxx | 4 ++--
i18npool/inc/breakiterator_th.hxx | 6 +++---
i18npool/inc/breakiterator_unicode.hxx | 4 ++--
i18npool/inc/calendarImpl.hxx | 4 ++--
i18npool/inc/calendar_gregorian.hxx | 4 ++--
i18npool/inc/calendar_hijri.hxx | 4 ++--
i18npool/inc/calendar_jewish.hxx | 4 ++--
i18npool/inc/cclass_unicode.hxx | 4 ++--
i18npool/inc/chaptercollator.hxx | 4 ++--
i18npool/inc/characterclassificationImpl.hxx | 4 ++--
i18npool/inc/collatorImpl.hxx | 4 ++--
i18npool/inc/collator_unicode.hxx | 4 ++--
i18npool/inc/defaultnumberingprovider.hxx | 4 ++--
i18npool/inc/indexentrysupplier.hxx | 4 ++--
i18npool/inc/indexentrysupplier_asian.hxx | 4 ++--
i18npool/inc/indexentrysupplier_common.hxx | 4 ++--
i18npool/inc/indexentrysupplier_default.hxx | 4 ++--
i18npool/inc/indexentrysupplier_ja_phonetic.hxx | 4 ++--
i18npool/inc/inputsequencechecker.hxx | 6 +++---
i18npool/inc/inputsequencechecker_hi.hxx | 4 ++--
i18npool/inc/inputsequencechecker_th.hxx | 6 +++---
i18npool/inc/localedata.hxx | 6 +++---
i18npool/inc/nativenumbersupplier.hxx | 4 ++--
i18npool/inc/numberformatcode.hxx | 6 +++---
i18npool/inc/servicename.hxx | 4 ++--
i18npool/inc/textToPronounce_zh.hxx | 4 ++--
i18npool/inc/textconversion.hxx | 4 ++--
i18npool/inc/textconversionImpl.hxx | 4 ++--
i18npool/inc/transliterationImpl.hxx | 4 ++--
i18npool/inc/transliteration_Ignore.hxx | 6 +++---
i18npool/inc/transliteration_Numeric.hxx | 6 +++---
i18npool/inc/transliteration_OneToOne.hxx | 6 +++---
i18npool/inc/transliteration_body.hxx | 4 ++--
i18npool/inc/transliteration_caseignore.hxx | 4 ++--
i18npool/inc/transliteration_commonclass.hxx | 6 +++---
i18npool/inc/unoscripttypedetector.hxx | 4 ++--
i18npool/inc/wtt.h | 6 +++---
i18npool/inc/xdictionary.hxx | 4 ++--
i18npool/source/localedata/LocaleNode.hxx | 4 ++--
i18npool/source/search/levdis.hxx | 4 ++--
i18npool/source/search/textsearch.hxx | 4 ++--
i18nutil/source/utility/casefolding_data.h | 4 ++--
i18nutil/source/utility/unicode_data.h | 4 ++--
i18nutil/source/utility/widthfolding_data.h | 4 ++--
idl/inc/hash.hxx | 2 +-
include/comphelper/scoped_disposing_ptr.hxx | 4 ++--
include/svl/svldllapi.h | 6 +++---
include/systools/win32/comptr.hxx | 4 ++--
include/systools/win32/snprintf.h | 6 +++---
include/test/htmltesttools.hxx | 4 ++--
include/test/xmltesttools.hxx | 4 ++--
include/vbahelper/vbadllapi.h | 2 +-
include/vcl/oldprintadaptor.hxx | 4 ++--
include/vcl/outdevmap.hxx | 6 +++---
include/vcl/outdevstate.hxx | 6 +++---
include/wntgcci/jni_md.h | 6 +++---
include/wntgcci/sehandler.hxx | 6 +++---
include/wntgccx/jni_md.h | 6 +++---
include/wntgccx/sehandler.hxx | 6 +++---
include/xmloff/unointerfacetouniqueidentifiermapper.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 6 +++---
jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 4 ++--
jvmfwk/source/elements.hxx | 4 ++--
jvmfwk/source/framework.hxx | 4 ++--
jvmfwk/source/fwkbase.hxx | 4 ++--
jvmfwk/source/fwkutil.hxx | 4 ++--
jvmfwk/source/libxmlutil.hxx | 4 ++--
l10ntools/inc/xrmlex.hxx | 4 ++--
o3tl/qa/cow_wrapper_clients.hxx | 6 +++---
oox/inc/services.hxx | 4 ++--
pyuno/inc/pyuno/pyuno.hxx | 4 ++--
pyuno/source/module/pyuno_impl.hxx | 4 ++--
registry/source/keyimpl.hxx | 4 ++--
registry/source/reflcnst.hxx | 4 ++--
registry/source/regimpl.hxx | 4 ++--
registry/test/regdiagnose.h | 6 +++---
rsc/inc/rscall.h | 6 +++---
rsc/inc/rscarray.hxx | 4 ++--
rsc/inc/rscclass.hxx | 6 +++---
rsc/inc/rscclobj.hxx | 6 +++---
rsc/inc/rscconst.hxx | 6 +++---
rsc/inc/rsccont.hxx | 6 +++---
rsc/inc/rscdb.hxx | 4 ++--
rsc/inc/rscdef.hxx | 6 +++---
rsc/inc/rscerror.h | 6 +++---
rsc/inc/rscflag.hxx | 6 +++---
rsc/inc/rschash.hxx | 6 +++---
rsc/inc/rsckey.hxx | 6 +++---
rsc/inc/rscmgr.hxx | 6 +++---
rsc/inc/rscpar.hxx | 6 +++---
rsc/inc/rscrange.hxx | 6 +++---
rsc/inc/rscrsc.hxx | 6 +++---
rsc/inc/rscstr.hxx | 6 +++---
rsc/inc/rsctools.hxx | 6 +++---
rsc/inc/rsctop.hxx | 6 +++---
rsc/inc/rsctree.hxx | 6 +++---
rsc/source/parser/rsclex.cxx | 2 --
sal/android/uthash.h | 6 +++---
sal/inc/internal/oslmemory.h | 4 ++--
sal/inc/internal/rtllifecycle.h | 4 ++--
sal/osl/unx/file_error_transl.h | 4 ++--
sal/osl/unx/file_impl.hxx | 6 +++---
sal/osl/unx/file_path_helper.h | 4 ++--
sal/osl/unx/file_path_helper.hxx | 4 ++--
sal/osl/unx/file_url.h | 6 +++---
sal/osl/unx/system.h | 6 +++---
sal/osl/unx/uunxapi.h | 6 +++---
sal/osl/unx/uunxapi.hxx | 6 +++---
sal/osl/w32/file_error.h | 6 +++---
sal/osl/w32/file_url.h | 6 +++---
sal/osl/w32/path_helper.h | 4 ++--
sal/osl/w32/path_helper.hxx | 4 ++--
sal/qa/OStringBuffer/rtl_String_Const.h | 6 +++---
sal/qa/OStringBuffer/rtl_String_Utils_Const.h | 6 +++---
sal/qa/inc/stringhelper.hxx | 4 ++--
sal/qa/osl/condition/osl_Condition_Const.h | 6 +++---
sal/qa/osl/file/osl_File_Const.h | 6 +++---
sal/qa/osl/module/osl_Module_Const.h | 6 +++---
sal/qa/osl/mutex/osl_Mutex_Const.h | 6 +++---
sal/qa/osl/security/osl_Security_Const.h | 6 +++---
sal/qa/osl/socket/sockethelper.hxx | 4 ++--
sal/qa/rtl/process/rtl_Process_Const.h | 4 ++--
sal/rtl/alloc_arena.hxx | 6 +++---
sal/rtl/alloc_cache.hxx | 6 +++---
sal/rtl/alloc_impl.hxx | 6 +++---
sal/rtl/hash.hxx | 6 +++---
sal/rtl/strimp.hxx | 6 +++---
sal/rtl/surrogates.hxx | 4 ++--
sal/workben/clipboardwben/testcopy/XTDataObject.hxx | 4 ++--
salhelper/test/rtti/samplelibrtti.hxx | 4 ++--
sax/source/expatwrap/attrlistimpl.hxx | 4 ++--
sax/source/tools/fastserializer.hxx | 4 ++--
sc/source/ui/inc/FTestDialog.hxx | 4 ++--
sccomp/source/solver/SolverComponent.hxx | 4 ++--
sd/source/ui/inc/createcustomanimationpanel.hxx | 4 ++--
setup_native/source/win32/customactions/tools/seterror.hxx | 4 ++--
setup_native/source/win32/wintools/makecab/parseddf.h | 6 +++---
sfx2/inc/sidebar/ContextChangeBroadcaster.hxx | 4 ++--
sfx2/inc/sidebar/PopupContainer.hxx | 4 ++--
sfx2/source/appl/helpdispatch.hxx | 2 +-
sfx2/source/inc/macroloader.hxx | 4 ++--
shell/source/backends/localebe/localebackend.hxx | 6 +++---
shell/source/backends/wininetbe/wininetbackend.hxx | 6 +++---
soltools/cpp/_getopt.h | 4 ++--
soltools/mkdepend/collectdircontent.hxx | 4 ++--
stoc/source/corereflection/lrucache.hxx | 4 ++--
stoc/source/javavm/interact.hxx | 6 +++---
stoc/source/javavm/javavm.hxx | 6 +++---
stoc/source/javavm/jvmargs.hxx | 4 ++--
stoc/source/security/lru_cache.h | 4 ++--
stoc/source/security/permissions.h | 4 ++--
stoc/source/uriproc/ExternalUriReferenceTranslator.hxx | 4 ++--
stoc/source/uriproc/UriReference.hxx | 4 ++--
stoc/source/uriproc/UriReferenceFactory.hxx | 4 ++--
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx | 4 ++--
svgio/inc/svgio/svgreader/svgcharacternode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgcirclenode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgclippathnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgdocument.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgdocumenthandler.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgellipsenode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svggnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svggradientnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svggradientstopnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgimagenode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svglinenode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgmarkernode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgmasknode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgpaint.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgpathnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgpatternnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgpolynode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgrectnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgstyleattributes.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgstylenode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgsvgnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgsymbolnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtextnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtextpathnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtitledescnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtoken.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtools.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtrefnode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgtspannode.hxx | 6 +++---
svgio/inc/svgio/svgreader/svgusenode.hxx | 6 +++---
svtools/inc/roadmap.hxx | 4 ++--
svtools/inc/table/defaultinputhandler.hxx | 6 +++---
svtools/inc/table/gridtablerenderer.hxx | 6 +++---
svtools/inc/table/tablecontrol.hxx | 6 +++---
svtools/inc/table/tablecontrolinterface.hxx | 6 +++---
svtools/inc/vclxaccessibleheaderbar.hxx | 6 +++---
svtools/inc/vclxaccessibleheaderbaritem.hxx | 6 +++---
svtools/source/inc/hatchwindow.hxx | 6 +++---
svtools/source/inc/hatchwindowfactory.hxx | 4 ++--
svx/inc/AccessibleTableShape.hxx | 4 ++--
svx/inc/polygn3d.hxx | 6 +++---
svx/inc/sdr/attribute/sdrfilltextattribute.hxx | 6 +++---
svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx | 6 +++---
svx/inc/sdr/contact/objectcontactofpageview.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofe3dcube.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofe3dextrude.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofe3dlathe.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofe3dsphere.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofgraphic.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofgroup.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofopenglobj.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx | 6 +++---
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx | 4 ++--
svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 6 +++---
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 6 +++---
svx/inc/sdr/overlay/overlaycrosshair.hxx | 6 +++---
svx/inc/sdr/overlay/overlayhatchrect.hxx | 6 +++---
svx/inc/sdr/overlay/overlayhelpline.hxx | 6 +++---
svx/inc/sdr/overlay/overlayline.hxx | 6 +++---
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 6 +++---
svx/inc/sdr/overlay/overlayrectangle.hxx | 6 +++---
svx/inc/sdr/overlay/overlayrollingrectangle.hxx | 6 +++---
svx/inc/sdr/overlay/overlaytools.hxx | 6 +++---
svx/inc/sdr/overlay/overlaytriangle.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrprimitivetools.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 6 +++---
svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx | 6 +++---
svx/inc/sdr/properties/captionproperties.hxx | 6 +++---
svx/inc/sdr/properties/circleproperties.hxx | 6 +++---
svx/inc/sdr/properties/connectorproperties.hxx | 6 +++---
svx/inc/sdr/properties/customshapeproperties.hxx | 6 +++---
svx/inc/sdr/properties/e3dextrudeproperties.hxx | 6 +++---
svx/inc/sdr/properties/e3dlatheproperties.hxx | 6 +++---
svx/inc/sdr/properties/e3dsceneproperties.hxx | 6 +++---
svx/inc/sdr/properties/e3dsphereproperties.hxx | 6 +++---
svx/inc/sdr/properties/graphicproperties.hxx | 6 +++---
svx/inc/sdr/properties/groupproperties.hxx | 6 +++---
svx/inc/sdr/properties/itemsettools.hxx | 6 +++---
svx/inc/sdr/properties/measureproperties.hxx | 6 +++---
svx/inc/sdr/properties/oleproperties.hxx | 6 +++---
svx/inc/sdr/properties/pageproperties.hxx | 6 +++---
svx/inc/svdglob.hxx | 6 +++---
svx/inc/svdoopengl.hxx | 4 ++--
svx/inc/sxallitm.hxx | 4 ++--
svx/inc/sxcikitm.hxx | 4 ++--
svx/inc/sxlayitm.hxx | 4 ++--
svx/inc/sxlogitm.hxx | 4 ++--
svx/inc/sxmkitm.hxx | 4 ++--
svx/inc/sxmoitm.hxx | 4 ++--
svx/inc/sxmovitm.hxx | 4 ++--
svx/inc/sxmsitm.hxx | 4 ++--
svx/inc/sxmtaitm.hxx | 4 ++--
svx/inc/sxoneitm.hxx | 4 ++--
svx/inc/sxonitm.hxx | 4 ++--
svx/inc/sxopitm.hxx | 4 ++--
svx/inc/sxraitm.hxx | 4 ++--
svx/inc/sxreaitm.hxx | 4 ++--
svx/inc/sxreoitm.hxx | 4 ++--
svx/inc/sxroaitm.hxx | 4 ++--
svx/inc/sxrooitm.hxx | 4 ++--
svx/inc/sxsaitm.hxx | 4 ++--
svx/inc/sxsalitm.hxx | 4 ++--
svx/inc/sxsoitm.hxx | 4 ++--
svx/inc/sxtraitm.hxx | 4 ++--
svx/source/accessibility/ChildrenManagerImpl.hxx | 1 +
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 4 ++--
svx/source/sidebar/ColorPanel.hxx | 4 ++--
svx/source/sidebar/debug/ColorPanel.hxx | 4 ++--
sw/source/core/inc/DocumentSettingManager.hxx | 4 ++--
testtools/source/bridgetest/multi.hxx | 4 ++--
toolkit/inc/helper/accessibilityclient.hxx | 6 +++---
toolkit/inc/helper/imagealign.hxx | 6 +++---
toolkit/inc/helper/tkresmgr.hxx | 6 +++---
toolkit/inc/helper/unopropertyarrayhelper.hxx | 6 +++---
toolkit/inc/helper/unowrapper.hxx | 6 +++---
tools/inc/poly.h | 4 ++--
ucb/source/cacher/dynamicresultsetwrapper.hxx | 3 ---
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVAuthListener.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx | 4 ++--
ucb/source/ucp/webdav-neon/DAVException.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVProperties.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVResource.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVSession.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DAVTypes.hxx | 6 +++---
ucb/source/ucp/webdav-neon/DateTimeHelper.hxx | 4 ++--
ucb/source/ucp/webdav-neon/LinkSequence.hxx | 6 +++---
ucb/source/ucp/webdav-neon/LockEntrySequence.hxx | 6 +++---
ucb/source/ucp/webdav-neon/LockSequence.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonSession.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonTypes.hxx | 6 +++---
ucb/source/ucp/webdav-neon/NeonUri.hxx | 6 +++---
ucb/source/ucp/webdav-neon/PropertyMap.hxx | 4 ++--
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx | 6 +++---
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 4 ++--
ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 4 ++--
ucb/source/ucp/webdav-neon/webdavprovider.hxx | 4 ++--
ucb/source/ucp/webdav-neon/webdavresultset.hxx | 4 ++--
ucb/source/ucp/webdav/AprEnv.hxx | 6 +++---
ucb/source/ucp/webdav/ContentProperties.hxx | 6 +++---
ucb/source/ucp/webdav/DAVAuthListener.hxx | 6 +++---
ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx | 4 ++--
ucb/source/ucp/webdav/DAVException.hxx | 6 +++---
ucb/source/ucp/webdav/DAVProperties.hxx | 6 +++---
ucb/source/ucp/webdav/DAVRequestEnvironment.hxx | 6 +++---
ucb/source/ucp/webdav/DAVResource.hxx | 6 +++---
ucb/source/ucp/webdav/DAVResourceAccess.hxx | 6 +++---
ucb/source/ucp/webdav/DAVSession.hxx | 6 +++---
ucb/source/ucp/webdav/DAVSessionFactory.hxx | 6 +++---
ucb/source/ucp/webdav/DAVTypes.hxx | 6 +++---
ucb/source/ucp/webdav/DateTimeHelper.hxx | 4 ++--
ucb/source/ucp/webdav/PropertyMap.hxx | 4 ++--
ucb/source/ucp/webdav/SerfCallbacks.hxx | 6 +++---
ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfInputStream.hxx | 6 +++---
ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfLockStore.hxx | 6 +++---
ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfRequestProcessor.hxx | 6 +++---
ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfSession.hxx | 6 +++---
ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx | 6 +++---
ucb/source/ucp/webdav/SerfUri.hxx | 6 +++---
ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx | 6 +++---
ucb/source/ucp/webdav/webdavcontent.hxx | 4 ++--
ucb/source/ucp/webdav/webdavdatasupplier.hxx | 4 ++--
ucb/source/ucp/webdav/webdavprovider.hxx | 4 ++--
ucb/source/ucp/webdav/webdavresponseparser.hxx | 6 +++---
ucb/source/ucp/webdav/webdavresultset.hxx | 4 ++--
vcl/generic/glyphs/scrptrun.h | 4 ++--
vcl/generic/print/prtsetup.hxx | 4 ++--
vcl/inc/quartz/salvd.h | 6 +++---
vcl/inc/unx/XIM.h | 4 ++--
vcl/inc/unx/gtk/hudawareness.h | 6 +++---
vcl/inc/unx/tde/tdedata.hxx | 6 +++---
vcl/osx/OSXTransferable.hxx | 4 ++--
vcl/source/filter/jpeg/JpegTransform.hxx | 2 +-
vcl/source/filter/jpeg/jpeg.hxx | 6 +++---
vcl/unx/gtk/fpicker/eventnotification.hxx | 4 ++--
vcl/unx/kde/FPServiceInfo.hxx | 4 ++--
winaccessibility/inc/UAccCOMdllapi.h | 4 ++--
xmlscript/source/inc/misc.hxx | 4 ++--
xmlscript/source/inc/xml_import.hxx | 4 ++--
xmlscript/source/xmldlg_imexp/common.hxx | 4 ++--
xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 6 +++---
xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 6 +++---
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 6 +++---
625 files changed, 1555 insertions(+), 1561 deletions(-)
New commits:
commit 2bd7767d010401199ad50c2ef2791b53ae03fb03
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu May 15 12:06:32 2014 +0200
Resolves fdo#70681: fixincludeguards.pl: all that's left
Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
index 9d503de..24e9c98 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 c225137..2e0f20b 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 e6dddf9..d41c033 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 7d53566..20ae748 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 6d89af6..87a3f23 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 e0283d1..507ee7d 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 23f325d..f31dcb8 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 df45af1..659c4fc 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 19d5edc..6a86cfb 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 b4b1dae..5be6371 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 bbecfbc..cb4ec21 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 1f1efce..86e8a6e 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 ba510e4..2b1c943 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 0552af4..cb70215 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 af64284..b5d1b02 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 69cbcdd9..3c308ca 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 91785b8..397a716 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 3a47e30..bb96470 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 6817df6..9f551bd 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 a5e8215..c1ba15c 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 1bc9fa1..b99325b 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 11ce48f..d51485c 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 948464f..36eebce 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 effb5b2..455d587 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 c907edb..a34c0bf 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 9cdffcc..f4984b6 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 82c6efc..37272c2 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 b29aea3..8ee2eb6 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 0432bf1..76d800b 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 0cdadf0..cf1d4e7 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 77e4591..018c5eb 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 e7db7a7..2426dea 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 f2868a3..b37158c 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 06a0674..913aa2b 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 809d1df..841da8f 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 0a713fb..f954872 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 24854b9..9bd7f25 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 8d3035d..b2e861d 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 e2b8673..8f4c8a9 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 afa7361..f0f82b5 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 6342677..93c14f2 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 96692dc..834c0de 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 b95beaa..bb9153b 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 5c72815..8eb1a72 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 f88e2a3..c5018c3 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 3ee36da..ba08659 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 f363444..f6e50a9 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 47011da..d5ecd5e 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 7e2846a..7fac671 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 38f8b7e..7ff0e34 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 de39963..ee9a2a3 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 1a27011..6622ba4 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 fda4cd8..25d6183 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 9398124..915d45b 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 9398124..90aad26 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 cfea6ab..ddd0493 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 9398124..09d2c97 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 cfea6ab..a7c25b3 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 3f44316..1635304 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 fda0dc1..ce16b6c 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 10263b2..2f10191 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 6ea16fd..9fb24fe 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 69f1eed..156bf8a 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 9f9d1cb..7962249 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 90034a0..7671151 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 19b603d..70eea08e 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 35dc8de..0358a84 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 3a739ce..c8292db 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 dbfb065..fe78e75 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 d7e2464..6377105 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 523108b..1970c56 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 aa5ab6b..f60ba4a 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 50a21d7..f295753 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 6f3e42b..fd11c6d 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 81e7639..bd09caa 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 cd69bf2..ceea643 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 83008e6..8628bb8 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 bdc8fe7..3ff412a 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 c96165b..11aa9fa 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 e70e8c1..284d44f 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 88cb118..1b14cd8 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 e53e181..0a0b251 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 77823f8..093b674 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 82d2c45..6f5f622 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 191c250..923848d 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 3beaa8c..c47bb29 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 ec607ae..e408e49 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 9048c44..76a86c8 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 26e1026..d1e8c1f 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 f1d60ed..b55f2c8 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 f960747..f2439da 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 5a86f5a..f6377d5 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 101c598..a755c59 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 323b11e..42e1db3 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 1487cfe..f71ea9e 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 47c4e91..a81e873 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 f40f03e..7afe47a 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 221864d..2193748 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 64d8f4d..821cf4f 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 a446079..e4b387e 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 5a96a38..bae2541 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 63de9d4..8a6401f 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 69ac454..2d5e031 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 f3e5dff..19187de 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 c754ab1..227e7da 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 fdfc19d..b685bdc 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 290fe95..8cb9d8f 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 60cd52e..8a0223e 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 3d1e7c9..5f6c26e 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 43a60f3..f0a53f3 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 7bd42ad..19bf550 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 0ebb192..4812bc5 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 090f759..89c8845 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 a6853ce..0d93717 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 0031dc5..23ca93e 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 740bd55..fbfbdb4 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 e3ebfd2..a8458a1 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 bb496df..e248dad 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 3634479..8e6f662 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 e614e50..a6214e9 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 bbaa799..19f7974 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 333fc7b..1cbf840 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 f149abb..3682ea2 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 6216213..708f21a 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 26029c8..8e0ad47 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 6f428c8..4b94573 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 bc23d88..9522aae 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 5e20010..3090439 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 7c9424f..308331e 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 fb024d8..12c1054 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 7358b9a..4f86c69 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 cab9b02..97ee1ed 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 8020662..8ee93a2 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 278f2aa..eb57ba7 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 8f3b2a0..e2fe228 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 43d94f1..fbe45cb 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 6e1b1c2..9577cb5 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 b791309..6bf5ec2 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 de50bd8..e612744 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 5689a7b..268c7a0 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 6d48914..2135344 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 6375657..0dbb0f5 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 07d3294..72b1b9a 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 da14fad..a70a669 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 49fba27..96688dd 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 10a9de9..98354f3 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 4e490a0..aeef1e0 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 4b4c148..4215274 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 f04f694..fa34f17 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 1238988..a152f63 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 2aab2aa..19db69b 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 56c21a2..c692638 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list