[Libreoffice-commits] core.git: 14 commits - basic/inc basic/qa basic/source canvas/source cui/source desktop/inc desktop/source desktop/unx editeng/inc editeng/source framework/inc framework/source include/sfx2 include/svx include/toolkit offapi/com sc/inc sd/source sfx2/inc sfx2/source shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common.mk shell/StaticLibrary_shlxthandler_common_x64.mk svl/source svl/unx svx/inc svx/source svx/workben sw/inc sw/source toolkit/source unotools/source vcl/aqua vcl/generic vcl/inc vcl/source vcl/unx
Thomas Arnhold
thomas at arnhold.org
Mon Oct 28 07:18:01 PDT 2013
basic/inc/basrid.hxx | 6 +++---
basic/inc/sb.hxx | 4 ++--
basic/qa/cppunit/basictest.hxx | 4 ++--
basic/source/inc/basiccharclass.hxx | 4 ++--
basic/source/inc/buffer.hxx | 4 ++--
basic/source/inc/codegen.hxx | 4 ++--
basic/source/inc/date.hxx | 4 ++--
basic/source/inc/dlgcont.hxx | 4 ++--
basic/source/inc/errobject.hxx | 4 ++--
basic/source/inc/expr.hxx | 4 ++--
basic/source/inc/filefmt.hxx | 4 ++--
basic/source/inc/image.hxx | 4 ++--
basic/source/inc/iosys.hxx | 4 ++--
basic/source/inc/namecont.hxx | 4 ++--
basic/source/inc/opcodes.hxx | 4 ++--
basic/source/inc/parser.hxx | 4 ++--
basic/source/inc/propacc.hxx | 4 ++--
basic/source/inc/runtime.hxx | 4 ++--
basic/source/inc/sbcomp.hxx | 4 ++--
basic/source/inc/sbdiagnose.hxx | 6 +++---
basic/source/inc/sbintern.hxx | 4 ++--
basic/source/inc/sbjsmeth.hxx | 4 ++--
basic/source/inc/sbjsmod.hxx | 4 ++--
basic/source/inc/sbtrace.hxx | 4 ++--
basic/source/inc/scanner.hxx | 4 ++--
basic/source/inc/scriptcont.hxx | 4 ++--
basic/source/inc/stdobj.hxx | 4 ++--
basic/source/inc/symtbl.hxx | 4 ++--
basic/source/inc/token.hxx | 4 ++--
basic/source/runtime/comenumwrapper.hxx | 6 +++---
basic/source/runtime/ddectrl.hxx | 4 ++--
basic/source/runtime/rtlproto.hxx | 4 ++--
basic/source/sbx/sbxconv.hxx | 4 ++--
basic/source/sbx/sbxdec.hxx | 4 ++--
basic/source/sbx/sbxres.hxx | 4 ++--
basic/source/uno/sbmodule.hxx | 6 +++---
canvas/source/cairo/cairo_cachedbitmap.hxx | 6 +++---
canvas/source/cairo/cairo_cairo.hxx | 4 ++--
canvas/source/cairo/cairo_canvas.hxx | 4 ++--
canvas/source/cairo/cairo_canvasbitmap.hxx | 6 +++---
canvas/source/cairo/cairo_canvascustomsprite.hxx | 6 +++---
canvas/source/cairo/cairo_canvasfont.hxx | 6 +++---
canvas/source/cairo/cairo_canvashelper.hxx | 6 +++---
canvas/source/cairo/cairo_devicehelper.hxx | 4 ++--
canvas/source/cairo/cairo_quartz_cairo.hxx | 4 ++--
canvas/source/cairo/cairo_repainttarget.hxx | 6 +++---
canvas/source/cairo/cairo_sprite.hxx | 6 +++---
canvas/source/cairo/cairo_spritecanvas.hxx | 4 ++--
canvas/source/cairo/cairo_spritecanvashelper.hxx | 6 +++---
canvas/source/cairo/cairo_spritedevicehelper.hxx | 4 ++--
canvas/source/cairo/cairo_spritehelper.hxx | 6 +++---
canvas/source/cairo/cairo_surfaceprovider.hxx | 4 ++--
canvas/source/cairo/cairo_textlayout.hxx | 6 +++---
canvas/source/cairo/cairo_win32_cairo.hxx | 4 ++--
canvas/source/cairo/cairo_xlib_cairo.hxx | 4 ++--
canvas/source/directx/dx_bitmap.hxx | 4 ++--
canvas/source/directx/dx_bitmapcanvashelper.hxx | 6 +++---
canvas/source/directx/dx_bitmapprovider.hxx | 4 ++--
canvas/source/directx/dx_canvas.hxx | 4 ++--
canvas/source/directx/dx_canvasbitmap.hxx | 6 +++---
canvas/source/directx/dx_canvascustomsprite.hxx | 6 +++---
canvas/source/directx/dx_canvasfont.hxx | 6 +++---
canvas/source/directx/dx_canvashelper.hxx | 6 +++---
canvas/source/directx/dx_config.hxx | 6 +++---
canvas/source/directx/dx_devicehelper.hxx | 6 +++---
canvas/source/directx/dx_gdiplususer.hxx | 6 +++---
canvas/source/directx/dx_graphicsprovider.hxx | 6 +++---
canvas/source/directx/dx_ibitmap.hxx | 4 ++--
canvas/source/directx/dx_impltools.hxx | 6 +++---
canvas/source/directx/dx_linepolypolygon.hxx | 6 +++---
canvas/source/directx/dx_rendermodule.hxx | 4 ++--
canvas/source/directx/dx_sprite.hxx | 6 +++---
canvas/source/directx/dx_spritecanvas.hxx | 4 ++--
canvas/source/directx/dx_spritecanvashelper.hxx | 6 +++---
canvas/source/directx/dx_spritedevicehelper.hxx | 6 +++---
canvas/source/directx/dx_spritehelper.hxx | 6 +++---
canvas/source/directx/dx_surfacebitmap.hxx | 4 ++--
canvas/source/directx/dx_surfacegraphics.hxx | 6 +++---
canvas/source/directx/dx_textlayout.hxx | 6 +++---
canvas/source/directx/dx_textlayout_drawhelper.hxx | 6 +++---
canvas/source/directx/dx_vcltools.hxx | 6 +++---
canvas/source/directx/dx_winstuff.hxx | 6 +++---
canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 4 ++--
canvas/source/opengl/ogl_buffercontext.hxx | 4 ++--
canvas/source/opengl/ogl_canvasbitmap.hxx | 4 ++--
canvas/source/opengl/ogl_canvascustomsprite.hxx | 4 ++--
canvas/source/opengl/ogl_canvasfont.hxx | 4 ++--
canvas/source/opengl/ogl_canvashelper.hxx | 4 ++--
canvas/source/opengl/ogl_canvastools.hxx | 4 ++--
canvas/source/opengl/ogl_spritecanvas.hxx | 4 ++--
canvas/source/opengl/ogl_spritedevicehelper.hxx | 4 ++--
canvas/source/opengl/ogl_textlayout.hxx | 4 ++--
canvas/source/opengl/ogl_texturecache.hxx | 4 ++--
canvas/source/opengl/ogl_tools.hxx | 4 ++--
canvas/source/tools/page.hxx | 4 ++--
canvas/source/tools/pagemanager.hxx | 4 ++--
canvas/source/tools/surface.hxx | 4 ++--
canvas/source/tools/surfaceproxy.hxx | 4 ++--
canvas/source/tools/surfacerect.hxx | 4 ++--
canvas/source/vcl/backbuffer.hxx | 6 +++---
canvas/source/vcl/bitmapbackbuffer.hxx | 6 +++---
canvas/source/vcl/cachedbitmap.hxx | 6 +++---
canvas/source/vcl/canvas.hxx | 4 ++--
canvas/source/vcl/canvasbitmap.hxx | 6 +++---
canvas/source/vcl/canvasbitmaphelper.hxx | 6 +++---
canvas/source/vcl/canvascustomsprite.hxx | 6 +++---
canvas/source/vcl/canvasfont.hxx | 6 +++---
canvas/source/vcl/canvashelper.hxx | 6 +++---
canvas/source/vcl/devicehelper.hxx | 6 +++---
canvas/source/vcl/impltools.hxx | 6 +++---
canvas/source/vcl/outdevprovider.hxx | 6 +++---
canvas/source/vcl/repainttarget.hxx | 6 +++---
canvas/source/vcl/sprite.hxx | 6 +++---
canvas/source/vcl/spritecanvas.hxx | 4 ++--
canvas/source/vcl/spritecanvashelper.hxx | 6 +++---
canvas/source/vcl/spritedevicehelper.hxx | 6 +++---
canvas/source/vcl/spritehelper.hxx | 6 +++---
canvas/source/vcl/textlayout.hxx | 6 +++---
canvas/source/vcl/windowoutdevholder.hxx | 6 +++---
cui/source/customize/eventdlg.hxx | 4 ++--
cui/source/customize/macropg_impl.hxx | 4 ++--
cui/source/dialogs/commonlingui.hxx | 6 +++---
cui/source/dialogs/thesdlg_impl.hxx | 4 ++--
cui/source/factory/dlgfact.hxx | 4 ++--
cui/source/inc/ControlFocusHelper.hxx | 6 +++---
cui/source/inc/SpellDialog.hxx | 4 ++--
cui/source/inc/about.hxx | 6 +++---
cui/source/inc/acccfg.hxx | 4 ++--
cui/source/inc/align.hxx | 4 ++--
cui/source/inc/autocdlg.hxx | 4 ++--
cui/source/inc/backgrnd.hxx | 6 +++---
cui/source/inc/bbdlg.hxx | 4 ++--
cui/source/inc/border.hxx | 4 ++--
cui/source/inc/cfg.hxx | 6 +++---
cui/source/inc/cfgutil.hxx | 4 ++--
cui/source/inc/chardlg.hxx | 6 +++---
cui/source/inc/connect.hxx | 6 +++---
cui/source/inc/cuicharmap.hxx | 4 ++--
cui/source/inc/cuifmsearch.hxx | 6 +++---
cui/source/inc/cuigaldlg.hxx | 6 +++---
cui/source/inc/cuigrfflt.hxx | 4 ++--
cui/source/inc/cuihyperdlg.hxx | 6 +++---
cui/source/inc/cuiimapwnd.hxx | 4 ++--
cui/source/inc/cuioptgenrl.hxx | 6 +++---
cui/source/inc/cuisrchdlg.hxx | 4 ++--
cui/source/inc/cuitabarea.hxx | 6 +++---
cui/source/inc/cuitabline.hxx | 6 +++---
cui/source/inc/cuitbxform.hxx | 4 ++--
cui/source/inc/dbregister.hxx | 8 ++++----
cui/source/inc/defdlgname.hxx | 4 ++--
cui/source/inc/dialmgr.hxx | 4 ++--
cui/source/inc/dlgname.hxx | 6 +++---
cui/source/inc/dstribut.hxx | 6 +++---
cui/source/inc/grfpage.hxx | 4 ++--
cui/source/inc/hangulhanjadlg.hxx | 4 ++--
cui/source/inc/headertablistbox.hxx | 4 ++--
cui/source/inc/hldocntp.hxx | 6 +++---
cui/source/inc/hldoctp.hxx | 6 +++---
cui/source/inc/hlinettp.hxx | 6 +++---
cui/source/inc/hlmailtp.hxx | 6 +++---
cui/source/inc/hlmarkwn.hxx | 6 +++---
cui/source/inc/hlmarkwn_def.hxx | 4 ++--
cui/source/inc/hltpbase.hxx | 6 +++---
cui/source/inc/hyphen.hxx | 4 ++--
cui/source/inc/iconcdlg.hxx | 6 +++---
cui/source/inc/insdlg.hxx | 6 +++---
cui/source/inc/insrc.hxx | 4 ++--
cui/source/inc/labdlg.hxx | 6 +++---
cui/source/inc/linkdlg.hxx | 6 +++---
cui/source/inc/macroass.hxx | 4 ++--
cui/source/inc/macropg.hxx | 4 ++--
cui/source/inc/measure.hxx | 6 +++---
cui/source/inc/multifil.hxx | 4 ++--
cui/source/inc/multipat.hxx | 6 +++---
cui/source/inc/newtabledlg.hxx | 6 +++---
cui/source/inc/numfmt.hxx | 4 ++--
cui/source/inc/numpages.hxx | 4 ++--
cui/source/inc/optasian.hxx | 4 ++--
cui/source/inc/optdict.hxx | 4 ++--
cui/source/inc/optlingu.hxx | 4 ++--
cui/source/inc/optpath.hxx | 4 ++--
cui/source/inc/page.hxx | 6 +++---
cui/source/inc/paragrph.hxx | 6 +++---
cui/source/inc/passwdomdlg.hxx | 4 ++--
cui/source/inc/pastedlg.hxx | 6 +++---
cui/source/inc/postdlg.hxx | 4 ++--
cui/source/inc/radiobtnbox.hxx | 6 +++---
cui/source/inc/scriptdlg.hxx | 6 +++---
cui/source/inc/sdrcelldlg.hxx | 6 +++---
cui/source/inc/selector.hxx | 4 ++--
cui/source/inc/showcols.hxx | 6 +++---
cui/source/inc/splitcelldlg.hxx | 4 ++--
cui/source/inc/srchxtra.hxx | 4 ++--
cui/source/inc/swpossizetabpage.hxx | 4 ++--
cui/source/inc/tabstpge.hxx | 6 +++---
cui/source/inc/textanim.hxx | 6 +++---
cui/source/inc/textattr.hxx | 6 +++---
cui/source/inc/thesdlg.hxx | 4 ++--
cui/source/inc/transfrm.hxx | 6 +++---
cui/source/inc/treeopt.hxx | 4 ++--
cui/source/inc/zoom.hxx | 4 ++--
cui/source/options/certpath.hxx | 4 ++--
cui/source/options/cfgchart.hxx | 6 +++---
cui/source/options/connpoolconfig.hxx | 6 +++---
cui/source/options/connpooloptions.hxx | 6 +++---
cui/source/options/connpoolsettings.hxx | 6 +++---
cui/source/options/dbregisterednamesconfig.hxx | 6 +++---
cui/source/options/dbregistersettings.hxx | 6 +++---
cui/source/options/doclinkdialog.hxx | 6 +++---
cui/source/options/fontsubs.hxx | 6 +++---
cui/source/options/optHeaderTabListbox.hxx | 6 +++---
cui/source/options/optaboutconfig.hxx | 4 ++--
cui/source/options/optaccessibility.hxx | 4 ++--
cui/source/options/optbasic.hxx | 6 +++---
cui/source/options/optchart.hxx | 6 +++---
cui/source/options/optcolor.hxx | 4 ++--
cui/source/options/optctl.hxx | 6 +++---
cui/source/options/optfltr.hxx | 4 ++--
cui/source/options/optgdlg.hxx | 6 +++---
cui/source/options/opthtml.hxx | 4 ++--
cui/source/options/optinet2.hxx | 6 +++---
cui/source/options/optjava.hxx | 6 +++---
cui/source/options/optjsearch.hxx | 4 ++--
cui/source/options/optmemory.hxx | 4 ++--
cui/source/options/optsave.hxx | 6 +++---
cui/source/options/optupdt.hxx | 4 ++--
cui/source/options/personalization.hxx | 6 +++---
cui/source/options/sdbcdriverenum.hxx | 6 +++---
cui/source/options/securityoptions.hxx | 6 +++---
cui/source/options/webconninfo.hxx | 6 +++---
cui/source/tabpages/borderconn.hxx | 4 ++--
cui/source/tabpages/chardlg.h | 4 ++--
cui/source/tabpages/page.h | 4 ++--
desktop/inc/app.hxx | 6 +++---
desktop/inc/liblibreoffice.hxx | 4 ++--
desktop/inc/migration.hxx | 4 ++--
desktop/source/app/cmdlineargs.hxx | 4 ++--
desktop/source/app/cmdlinehelp.hxx | 4 ++--
desktop/source/app/configinit.hxx | 4 ++--
desktop/source/app/desktopcontext.hxx | 6 +++---
desktop/source/app/desktopresid.hxx | 6 +++---
desktop/source/app/dispatchwatcher.hxx | 6 +++---
desktop/source/app/officeipcthread.hxx | 6 +++---
desktop/source/deployment/gui/descedit.hxx | 6 +++---
desktop/source/deployment/gui/dp_gui.h | 4 ++--
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 ++--
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx | 4 ++--
desktop/source/deployment/gui/dp_gui_shared.hxx | 4 ++--
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 4 ++--
desktop/source/deployment/gui/dp_gui_updatedata.hxx | 4 ++--
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 4 ++--
desktop/source/deployment/inc/dp_interact.h | 4 ++--
desktop/source/deployment/inc/dp_misc.h | 4 ++--
desktop/source/deployment/inc/dp_persmap.h | 4 ++--
desktop/source/deployment/inc/dp_platform.hxx | 4 ++--
desktop/source/deployment/inc/dp_resource.h | 4 ++--
desktop/source/deployment/inc/dp_ucb.h | 4 ++--
desktop/source/deployment/inc/dp_update.hxx | 4 ++--
desktop/source/deployment/inc/dp_xml.h | 4 ++--
desktop/source/deployment/manager/dp_commandenvironments.hxx | 4 ++--
desktop/source/deployment/manager/dp_extensionmanager.hxx | 4 ++--
desktop/source/deployment/manager/dp_manager.h | 4 ++--
desktop/source/deployment/manager/dp_properties.hxx | 4 ++--
desktop/source/deployment/registry/component/dp_compbackenddb.hxx | 4 ++--
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 4 ++--
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx | 4 ++--
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 4 ++--
desktop/source/deployment/registry/inc/dp_backend.h | 4 ++--
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 4 ++--
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 4 ++--
desktop/source/deployment/registry/script/dp_lib_container.h | 4 ++--
desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx | 4 ++--
desktop/source/inc/exithelper.h | 6 +++---
desktop/source/migration/migration_impl.hxx | 4 ++--
desktop/source/migration/services/basicmigration.hxx | 6 +++---
desktop/source/migration/services/misc.hxx | 6 +++---
desktop/source/migration/services/oo3extensionmigration.hxx | 6 +++---
desktop/source/migration/services/wordbookmigration.hxx | 4 ++--
desktop/unx/source/file_image.h | 4 ++--
desktop/unx/source/splashx.h | 6 +++---
editeng/inc/editxml.hxx | 4 ++--
editeng/source/accessibility/AccessibleHyperlink.hxx | 4 ++--
editeng/source/editeng/editattr.hxx | 6 +++---
editeng/source/editeng/editdbg.hxx | 6 +++---
editeng/source/editeng/editdoc.hxx | 6 +++---
editeng/source/editeng/editobj2.hxx | 6 +++---
editeng/source/editeng/editsel.hxx | 6 +++---
editeng/source/editeng/editstt2.hxx | 6 +++---
editeng/source/editeng/editundo.hxx | 6 +++---
editeng/source/editeng/edtspell.hxx | 4 ++--
editeng/source/editeng/eehtml.hxx | 6 +++---
editeng/source/editeng/eeobj.hxx | 6 +++---
editeng/source/editeng/eerdll2.hxx | 6 +++---
editeng/source/editeng/eertfpar.hxx | 6 +++---
editeng/source/editeng/impedit.hxx | 6 +++---
editeng/source/editeng/textconv.hxx | 4 ++--
editeng/source/misc/SvXMLAutoCorrectExport.hxx | 4 ++--
editeng/source/misc/SvXMLAutoCorrectImport.hxx | 4 ++--
editeng/source/outliner/outleeng.hxx | 4 ++--
editeng/source/outliner/outlundo.hxx | 4 ++--
editeng/source/outliner/paralist.hxx | 4 ++--
editeng/source/xml/editsource.hxx | 4 ++--
framework/inc/services/ContextChangeEventMultiplexer.hxx | 1 -
framework/source/uielement/popuptoolbarcontroller.cxx | 2 --
include/sfx2/event.hxx | 2 --
include/sfx2/sidebar/CommandInfoProvider.hxx | 2 --
include/sfx2/sidebar/ContextChangeBroadcaster.hxx | 1 -
include/sfx2/sidebar/ControllerFactory.hxx | 1 -
include/sfx2/sidebar/ControllerItem.hxx | 2 --
include/sfx2/sidebar/Sidebar.hxx | 1 -
include/sfx2/sidebar/SidebarPanelBase.hxx | 2 --
include/sfx2/sidebar/SidebarToolBox.hxx | 1 -
include/sfx2/sidebar/Theme.hxx | 2 --
include/sfx2/sidebar/Tools.hxx | 1 -
include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 1 -
include/svx/sidebar/SelectionChangeHandler.hxx | 1 -
include/toolkit/awt/vclxmenu.hxx | 2 --
offapi/com/sun/star/ucb/Content.idl | 10 +++++-----
sc/inc/ScPanelFactory.hxx | 1 -
sd/source/ui/inc/framework/FrameworkHelper.hxx | 1 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2 --
sd/source/ui/sidebar/LayoutMenu.hxx | 2 --
sd/source/ui/sidebar/MasterPagesSelector.hxx | 1 -
sd/source/ui/sidebar/NavigatorWrapper.hxx | 2 --
sd/source/ui/sidebar/PanelBase.hxx | 2 --
sd/source/ui/sidebar/PanelFactory.hxx | 2 --
sfx2/inc/arrdecl.hxx | 4 ++--
sfx2/inc/backingcomp.hxx | 6 +++---
sfx2/inc/bitset.hxx | 4 ++--
sfx2/inc/bluthsndapi.hxx | 4 ++--
sfx2/inc/configmgr.hxx | 4 ++--
sfx2/inc/frmload.hxx | 4 ++--
sfx2/inc/fwkhelper.hxx | 4 ++--
sfx2/inc/guisaveas.hxx | 4 ++--
sfx2/inc/idpool.hxx | 4 ++--
sfx2/inc/inettbc.hxx | 4 ++--
sfx2/inc/sorgitm.hxx | 4 ++--
sfx2/inc/srchdlg.hxx | 6 +++---
sfx2/inc/templatedlg.hxx | 6 +++---
sfx2/source/appl/fileobj.hxx | 4 ++--
sfx2/source/appl/helpdispatch.hxx | 4 ++--
sfx2/source/appl/helpinterceptor.hxx | 6 +++---
sfx2/source/appl/imestatuswindow.hxx | 6 +++---
sfx2/source/appl/impldde.hxx | 4 ++--
sfx2/source/appl/newhelp.hxx | 6 +++---
sfx2/source/appl/panelist.hxx | 4 ++--
sfx2/source/bastyp/fltlst.hxx | 6 +++---
sfx2/source/control/thumbnailviewacc.hxx | 6 +++---
sfx2/source/dialog/backingwindow.hxx | 4 ++--
sfx2/source/dialog/filedlgimpl.hxx | 6 +++---
sfx2/source/dialog/filtergrouping.hxx | 6 +++---
sfx2/source/doc/doctemplateslocal.hxx | 4 ++--
sfx2/source/doc/graphhelp.hxx | 4 ++--
sfx2/source/doc/oleprops.hxx | 4 ++--
sfx2/source/doc/printhelper.hxx | 4 ++--
sfx2/source/doc/querytemplate.hxx | 4 ++--
sfx2/source/doc/sfxacldetect.hxx | 4 ++--
sfx2/source/doc/syspath.hxx | 4 ++--
sfx2/source/inc/SfxDocumentMetaData.hxx | 4 ++--
sfx2/source/inc/alienwarn.hxx | 6 +++---
sfx2/source/inc/appbas.hxx | 4 ++--
sfx2/source/inc/appbaslib.hxx | 6 +++---
sfx2/source/inc/appdata.hxx | 6 +++---
sfx2/source/inc/doctemplates.hxx | 4 ++--
sfx2/source/inc/documentfontsdialog.hxx | 4 ++--
sfx2/source/inc/docundomanager.hxx | 6 +++---
sfx2/source/inc/eventsupplier.hxx | 4 ++--
sfx2/source/inc/fltoptint.hxx | 4 ++--
sfx2/source/inc/helper.hxx | 6 +++---
sfx2/source/inc/iframe.hxx | 4 ++--
sfx2/source/inc/inputdlg.hxx | 6 +++---
sfx2/source/inc/nochaos.hxx | 4 ++--
sfx2/source/inc/objshimp.hxx | 4 ++--
sfx2/source/inc/openflag.hxx | 4 ++--
sfx2/source/inc/ownsubfilterservice.hxx | 4 ++--
sfx2/source/inc/partwnd.hxx | 4 ++--
sfx2/source/inc/plugin.hxx | 4 ++--
sfx2/source/inc/preview.hxx | 4 ++--
sfx2/source/inc/recfloat.hxx | 4 ++--
sfx2/source/inc/referers.hxx | 4 ++--
sfx2/source/inc/sfxpicklist.hxx | 6 +++---
sfx2/source/inc/sfxtypes.hxx | 6 +++---
sfx2/source/inc/sfxurlrelocator.hxx | 4 ++--
sfx2/source/inc/slotserv.hxx | 4 ++--
sfx2/source/inc/splitwin.hxx | 6 +++---
sfx2/source/inc/statcach.hxx | 4 ++--
sfx2/source/inc/templatesearchview.hxx | 6 +++---
sfx2/source/inc/templatesearchviewitem.hxx | 6 +++---
sfx2/source/inc/templdgi.hxx | 6 +++---
sfx2/source/inc/tplcitem.hxx | 4 ++--
sfx2/source/inc/versdlg.hxx | 4 ++--
sfx2/source/inc/virtmenu.hxx | 4 ++--
sfx2/source/inc/workwin.hxx | 4 ++--
sfx2/source/menu/thessubmenu.hxx | 4 ++--
sfx2/source/sidebar/Accessible.hxx | 5 ++---
sfx2/source/sidebar/AccessibleTitleBar.hxx | 6 ++----
sfx2/source/sidebar/AsynchronousCall.hxx | 4 ++--
sfx2/source/sidebar/Context.hxx | 4 ++--
sfx2/source/sidebar/ContextList.hxx | 4 ++--
sfx2/source/sidebar/ContextMatcher.hxx | 4 ++--
sfx2/source/sidebar/Deck.hxx | 6 ++----
sfx2/source/sidebar/DeckConfiguration.hxx | 4 ++--
sfx2/source/sidebar/DeckDescriptor.hxx | 4 ++--
sfx2/source/sidebar/DeckLayouter.hxx | 6 ++----
sfx2/source/sidebar/DeckTitleBar.hxx | 4 ++--
sfx2/source/sidebar/DrawHelper.hxx | 4 ++--
sfx2/source/sidebar/FocusManager.hxx | 4 ++--
sfx2/source/sidebar/MenuButton.hxx | 4 ++--
sfx2/source/sidebar/Paint.hxx | 4 ++--
sfx2/source/sidebar/Panel.hxx | 5 ++---
sfx2/source/sidebar/PanelDescriptor.hxx | 4 ++--
sfx2/source/sidebar/PanelTitleBar.hxx | 4 ++--
sfx2/source/sidebar/ResourceManager.hxx | 6 ++----
sfx2/source/sidebar/SidebarController.hxx | 6 ++----
sfx2/source/sidebar/SidebarDockingWindow.hxx | 4 ++--
sfx2/source/sidebar/SidebarPanel.hxx | 5 ++---
sfx2/source/sidebar/SidebarResource.hxx | 4 ++--
sfx2/source/sidebar/TabBar.hxx | 5 ++---
sfx2/source/sidebar/TabItem.hxx | 4 ++--
sfx2/source/sidebar/TitleBar.hxx | 4 ++--
sfx2/source/view/impframe.hxx | 4 ++--
sfx2/source/view/impviewframe.hxx | 6 +++---
sfx2/source/view/viewimp.hxx | 4 ++--
shell/Library_ooofilt.mk | 2 --
shell/Library_ooofilt_x64.mk | 2 --
shell/Library_propertyhdl.mk | 2 --
shell/Library_propertyhdl_x64.mk | 2 --
shell/Library_shlxthdl.mk | 2 --
shell/Library_shlxthdl_x64.mk | 2 --
shell/StaticLibrary_shlxthandler_common.mk | 2 --
shell/StaticLibrary_shlxthandler_common_x64.mk | 2 --
svl/source/fsstor/oinputstreamcontainer.hxx | 4 ++--
svl/source/fsstor/ostreamcontainer.hxx | 4 ++--
svl/source/inc/passwordcontainer.hxx | 6 +++---
svl/source/items/whassert.hxx | 4 ++--
svl/source/misc/getstringresource.hxx | 4 ++--
svl/source/notify/listenerbase.hxx | 4 ++--
svl/source/numbers/numfmuno.hxx | 4 ++--
svl/source/numbers/numhead.hxx | 4 ++--
svl/source/numbers/supservs.hxx | 6 +++---
svl/source/numbers/zforfind.hxx | 6 +++---
svl/source/numbers/zforscan.hxx | 6 +++---
svl/source/passwordcontainer/syscreds.hxx | 6 +++---
svl/source/svdde/ddeimp.hxx | 6 +++---
svl/unx/inc/convert.hxx | 7 ++++---
svx/inc/GalleryControl.hxx | 4 ++--
svx/inc/dialdll.hxx | 4 ++--
svx/inc/dragmt3d.hxx | 6 +++---
svx/inc/extrusiondepthdialog.hxx | 6 +++---
svx/inc/galbrws2.hxx | 4 ++--
svx/inc/galobj.hxx | 4 ++--
svx/inc/sidebar/PanelFactory.hxx | 6 ++----
svx/inc/svdibrow.hxx | 6 +++---
svx/inc/tbunocontroller.hxx | 6 +++---
svx/inc/tbunosearchcontrollers.hxx | 6 +++---
svx/inc/unomlstr.hxx | 4 ++--
svx/inc/xpolyimp.hxx | 6 +++---
svx/source/accessibility/AccessibleEmptyEditSource.hxx | 4 ++--
svx/source/accessibility/AccessibleTextEventQueue.hxx | 6 +++---
svx/source/accessibility/ChildrenManagerImpl.hxx | 2 +-
svx/source/customshapes/EnhancedCustomShape3d.hxx | 4 ++--
svx/source/customshapes/EnhancedCustomShapeEngine.hxx | 4 ++--
svx/source/customshapes/EnhancedCustomShapeFontWork.hxx | 4 ++--
svx/source/customshapes/EnhancedCustomShapeHandle.hxx | 4 ++--
svx/source/dialog/contimp.hxx | 6 +++---
svx/source/dialog/contwnd.hxx | 4 ++--
svx/source/dialog/dlgunit.hxx | 6 +++---
svx/source/dialog/imapimp.hxx | 4 ++--
svx/source/dialog/imapwnd.hxx | 4 ++--
svx/source/dialog/rlrcitem.hxx | 4 ++--
svx/source/dialog/srchctrl.hxx | 4 ++--
svx/source/engine3d/helperminimaldepth3d.hxx | 6 +++---
svx/source/gallery2/GallerySplitter.hxx | 4 ++--
svx/source/gallery2/galbrws2.cxx | 3 ---
svx/source/inc/AccessibleFrameSelector.hxx | 4 ++--
svx/source/inc/GraphCtlAccessibleContext.hxx | 4 ++--
svx/source/inc/clonelist.hxx | 6 +++---
svx/source/inc/datalistener.hxx | 6 +++---
svx/source/inc/datanavi.hxx | 6 +++---
svx/source/inc/delayedevent.hxx | 6 +++---
svx/source/inc/docrecovery.hxx | 4 ++--
svx/source/inc/filtnav.hxx | 6 +++---
svx/source/inc/fmPropBrw.hxx | 6 +++---
svx/source/inc/fmcontrolbordermanager.hxx | 6 +++---
svx/source/inc/fmcontrollayout.hxx | 6 +++---
svx/source/inc/fmdocumentclassification.hxx | 6 +++---
svx/source/inc/fmexch.hxx | 4 ++--
svx/source/inc/fmexpl.hxx | 6 +++---
svx/source/inc/fmitems.hxx | 6 +++---
svx/source/inc/fmobj.hxx | 4 ++--
svx/source/inc/fmpgeimp.hxx | 6 +++---
svx/source/inc/fmscriptingenv.hxx | 6 +++---
svx/source/inc/fmservs.hxx | 6 +++---
svx/source/inc/fmshimp.hxx | 6 +++---
svx/source/inc/fmslotinvalidator.hxx | 6 +++---
svx/source/inc/fmtextcontroldialogs.hxx | 6 +++---
svx/source/inc/fmtextcontrolfeature.hxx | 6 +++---
svx/source/inc/fmtextcontrolshell.hxx | 6 +++---
svx/source/inc/fmundo.hxx | 6 +++---
svx/source/inc/fmurl.hxx | 6 +++---
svx/source/inc/fmvwimp.hxx | 6 +++---
svx/source/inc/formcontrolfactory.hxx | 6 +++---
svx/source/inc/formcontroller.hxx | 6 +++---
svx/source/inc/formcontrolling.hxx | 6 +++---
svx/source/inc/formdispatchinterceptor.hxx | 6 +++---
svx/source/inc/formfeaturedispatcher.hxx | 4 ++--
svx/source/inc/formtoolbars.hxx | 6 +++---
svx/source/inc/frmselimpl.hxx | 4 ++--
svx/source/inc/gridcell.hxx | 6 +++---
svx/source/inc/gridcols.hxx | 6 +++---
svx/source/inc/recoveryui.hxx | 6 +++---
svx/source/inc/sdbdatacolumn.hxx | 6 +++---
svx/source/inc/sqlparserclient.hxx | 6 +++---
svx/source/inc/stringlistresource.hxx | 6 +++---
svx/source/inc/svdoutlinercache.hxx | 4 ++--
svx/source/inc/svxrectctaccessiblecontext.hxx | 4 ++--
svx/source/inc/tabwin.hxx | 4 ++--
svx/source/inc/tbxform.hxx | 4 ++--
svx/source/inc/treevisitor.hxx | 6 +++---
svx/source/inc/typeconversionclient.hxx | 6 +++---
svx/source/inc/unogalthemeprovider.hxx | 4 ++--
svx/source/inc/xfm_addcondition.hxx | 6 +++---
svx/source/inc/xmlxtexp.hxx | 4 ++--
svx/source/inc/xmlxtimp.hxx | 4 ++--
svx/source/items/galleryitem.cxx | 2 --
svx/source/sdr/contact/sdrmediawindow.hxx | 2 +-
svx/source/sidebar/EmptyPanel.hxx | 4 ++--
svx/source/sidebar/area/AreaPropertyPanel.hxx | 6 +++---
svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx | 4 ++--
svx/source/sidebar/debug/ContextPanel.hxx | 4 ++--
svx/source/sidebar/debug/NotYetImplementedPanel.hxx | 4 ++--
svx/source/sidebar/gallery/GalleryPanel.hxx | 4 ++--
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 4 ++--
svx/source/sidebar/insert/InsertPropertyPanel.hxx | 5 ++---
svx/source/sidebar/line/LinePropertyPanel.hxx | 4 ++--
svx/source/sidebar/line/LineWidthPopup.hxx | 4 ++--
svx/source/sidebar/line/LineWidthValueSet.hxx | 6 +++---
svx/source/sidebar/nbdtmg.cxx | 1 -
svx/source/sidebar/paragraph/ParaBulletsControl.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaBulletsPopup.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaNumberingControl.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaNumberingPopup.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 5 ++---
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 6 +++---
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 4 ++--
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 4 ++--
svx/source/sidebar/text/TextCharacterSpacingPopup.hxx | 4 ++--
svx/source/sidebar/text/TextPropertyPanel.hxx | 4 ++--
svx/source/sidebar/text/TextUnderlineControl.hxx | 4 ++--
svx/source/sidebar/text/TextUnderlinePopup.hxx | 4 ++--
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 1 -
svx/source/stbctrls/stbctrls.h | 4 ++--
svx/source/svdraw/gradtrns.hxx | 6 +++---
svx/source/svdraw/svdconv.hxx | 6 +++---
svx/source/svdraw/svddrgm1.hxx | 6 +++---
svx/source/svdraw/svdfmtf.hxx | 6 +++---
svx/source/table/accessiblecell.hxx | 4 ++--
svx/source/table/cell.hxx | 4 ++--
svx/source/table/cellcursor.hxx | 4 ++--
svx/source/table/cellrange.hxx | 4 ++--
svx/source/table/celltypes.hxx | 4 ++--
svx/source/table/propertyset.hxx | 4 ++--
svx/source/table/tablecolumn.hxx | 4 ++--
svx/source/table/tablecolumns.hxx | 4 ++--
svx/source/table/tablehandles.hxx | 4 ++--
svx/source/table/tablelayouter.hxx | 4 ++--
svx/source/table/tablemodel.hxx | 4 ++--
svx/source/table/tablerow.hxx | 4 ++--
svx/source/table/tablerows.hxx | 4 ++--
svx/source/table/tableundo.hxx | 4 ++--
svx/source/table/viewcontactoftableobj.hxx | 4 ++--
svx/source/tbxctrls/colorwindow.hxx | 4 ++--
svx/source/tbxctrls/extrusioncontrols.hxx | 4 ++--
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4 ++--
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 4 ++--
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 4 ++--
svx/source/unodialogs/textconversiondlgs/resid.hxx | 4 ++--
svx/source/unodraw/UnoGraphicExporter.hxx | 4 ++--
svx/source/unodraw/UnoNameItemTable.hxx | 6 +++---
svx/source/unodraw/shapeimpl.hxx | 4 ++--
svx/source/unogallery/unogalitem.hxx | 4 ++--
svx/source/unogallery/unogaltheme.hxx | 4 ++--
svx/workben/msview/xmlconfig.hxx | 4 ++--
sw/inc/SwPanelFactory.hxx | 2 --
sw/source/ui/sidebar/PagePropertyPanel.hxx | 2 --
toolkit/source/awt/vclxmenu.cxx | 3 ---
unotools/source/config/itemholder1.hxx | 6 +++---
unotools/source/ucbhelper/XTempFile.hxx | 4 ++--
vcl/aqua/source/a11y/aqua11yactionwrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11ycomponentwrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11yfocuslistener.hxx | 6 +++---
vcl/aqua/source/a11y/aqua11yrolehelper.h | 6 +++---
vcl/aqua/source/a11y/aqua11yselectionwrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11ytablewrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11ytextwrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11yutil.h | 6 +++---
vcl/aqua/source/a11y/aqua11yvaluewrapper.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperbutton.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappercheckbox.h | 4 ++--
vcl/aqua/source/a11y/aqua11ywrappercombobox.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappergroup.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperlist.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h | 4 ++--
vcl/aqua/source/a11y/aqua11ywrapperrow.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappersplitter.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrapperstatictext.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappertabgroup.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappertextarea.h | 6 +++---
vcl/aqua/source/a11y/aqua11ywrappertoolbar.h | 6 +++---
vcl/aqua/source/a11y/documentfocuslistener.hxx | 6 +++---
vcl/aqua/source/dtrans/DataFlavorMapping.hxx | 4 ++--
vcl/aqua/source/dtrans/DragSource.hxx | 4 ++--
vcl/aqua/source/dtrans/DragSourceContext.hxx | 4 ++--
vcl/aqua/source/dtrans/DropTarget.hxx | 4 ++--
vcl/aqua/source/dtrans/HtmlFmtFlt.hxx | 4 ++--
vcl/aqua/source/dtrans/PictToBmpFlt.hxx | 4 ++--
vcl/aqua/source/dtrans/aqua_clipboard.hxx | 4 ++--
vcl/generic/glyphs/gcach_ftyp.hxx | 6 +++---
vcl/generic/print/glyphset.hxx | 4 ++--
vcl/generic/print/psputil.hxx | 6 +++---
vcl/inc/accel.h | 6 +++---
vcl/inc/accmgr.hxx | 6 +++---
vcl/inc/android/androidinst.hxx | 6 +++---
vcl/inc/android/svsys.h | 6 +++---
vcl/inc/aqua/aqua11yfactory.h | 6 +++---
vcl/inc/aqua/aqua11yfocustracker.hxx | 6 +++---
vcl/inc/aqua/aqua11ylistener.hxx | 6 +++---
vcl/inc/aqua/aqua11ywrapper.h | 6 +++---
vcl/inc/aqua/aquaprintview.h | 4 ++--
vcl/inc/aqua/aquavcltypes.h | 6 +++---
vcl/inc/aqua/atsui/salatsuifontutils.hxx | 6 +++---
vcl/inc/aqua/keyboardfocuslistener.hxx | 6 +++---
vcl/inc/aqua/salframeview.h | 4 ++--
vcl/inc/aqua/salmathutils.hxx | 6 +++---
vcl/inc/aqua/salnativewidgets.h | 6 +++---
vcl/inc/aqua/salnsmenu.h | 4 ++--
vcl/inc/aqua/salnstimer.h | 4 ++--
vcl/inc/aqua/vclnsapp.h | 4 ++--
vcl/inc/bmpfast.hxx | 6 +++---
vcl/inc/brdwin.hxx | 6 +++---
vcl/inc/canvasbitmap.hxx | 4 ++--
vcl/inc/controldata.hxx | 6 +++---
vcl/inc/coretext/common.h | 6 +++---
vcl/inc/cupsmgr.hxx | 4 ++--
vcl/inc/cvtsvm.hxx | 6 +++---
vcl/inc/dbggui.hxx | 6 +++---
vcl/inc/dndevdis.hxx | 4 ++--
vcl/inc/dndlcon.hxx | 4 ++--
vcl/inc/fontcache.hxx | 6 +++---
vcl/inc/fontsubset.hxx | 6 +++---
vcl/inc/generic/gendata.hxx | 4 ++--
vcl/inc/generic/gendisp.hxx | 6 +++---
vcl/inc/generic/geninst.h | 6 +++---
vcl/inc/generic/genprn.h | 4 ++--
vcl/inc/generic/genpspgraphics.h | 6 +++---
vcl/inc/generic/gensys.h | 6 +++---
vcl/inc/generic/glyphcache.hxx | 6 +++---
vcl/inc/generic/printergfx.hxx | 6 +++---
vcl/inc/generic/printerjob.hxx | 6 +++---
vcl/inc/graphite_layout.hxx | 6 +++---
vcl/inc/graphite_serverfont.hxx | 6 +++---
vcl/inc/headless/svpbmp.hxx | 4 ++--
vcl/inc/headless/svpdummies.hxx | 2 +-
vcl/inc/headless/svpframe.hxx | 4 ++--
vcl/inc/headless/svpgdi.hxx | 4 ++--
vcl/inc/headless/svpinst.hxx | 4 ++--
vcl/inc/headless/svpprn.hxx | 6 +++---
vcl/inc/headless/svpvd.hxx | 6 +++---
vcl/inc/helpwin.hxx | 6 +++---
vcl/inc/idlemgr.hxx | 6 +++---
vcl/inc/ilstbox.hxx | 6 +++---
vcl/inc/image.h | 6 +++---
vcl/inc/impbmp.hxx | 6 +++---
vcl/inc/impfont.hxx | 6 +++---
vcl/inc/impgraph.hxx | 6 +++---
vcl/inc/impimagetree.hxx | 4 ++--
vcl/inc/impoct.hxx | 6 +++---
vcl/inc/ios/iosinst.hxx | 6 +++---
vcl/inc/ios/svsys.h | 6 +++---
vcl/inc/jobset.h | 6 +++---
vcl/inc/langboost.hxx | 4 ++--
vcl/inc/list.h | 6 +++---
vcl/inc/outdata.hxx | 6 +++---
vcl/inc/outdev.h | 6 +++---
vcl/inc/outfont.hxx | 6 +++---
vcl/inc/print.h | 6 +++---
vcl/inc/printdlg.hxx | 6 +++---
vcl/inc/quartz/salbmp.h | 6 +++---
vcl/inc/quartz/salgdicommon.hxx | 6 +++---
vcl/inc/quartz/utils.h | 6 +++---
vcl/inc/regionband.hxx | 6 +++---
vcl/inc/saldatabasic.hxx | 4 ++--
vcl/inc/salframe.hxx | 6 +++---
vcl/inc/salgdi.hxx | 6 +++---
vcl/inc/salgeom.hxx | 6 +++---
vcl/inc/salimestatus.hxx | 4 ++--
vcl/inc/sallayout.hxx | 6 +++---
vcl/inc/salmenu.hxx | 6 +++---
vcl/inc/salobj.hxx | 6 +++---
vcl/inc/salprn.hxx | 6 +++---
vcl/inc/salptype.hxx | 6 +++---
vcl/inc/salsession.hxx | 4 ++--
vcl/inc/salsys.hxx | 6 +++---
vcl/inc/saltimer.hxx | 6 +++---
vcl/inc/salvd.hxx | 6 +++---
vcl/inc/salwtype.hxx | 6 +++---
vcl/inc/sft.hxx | 6 +++---
vcl/inc/svdata.hxx | 6 +++---
vcl/inc/svsys.h | 4 ++--
vcl/inc/textlayout.hxx | 6 +++---
vcl/inc/toolbox.h | 6 +++---
vcl/inc/unx/desktops.hxx | 6 +++---
vcl/inc/unx/gtk/atkbridge.hxx | 4 ++--
vcl/inc/unx/gtk/gloactiongroup.h | 6 +++---
vcl/inc/unx/gtk/glomenu.h | 6 +++---
vcl/inc/unx/gtk/gtkdata.hxx | 6 +++---
vcl/inc/unx/gtk/gtkframe.hxx | 6 +++---
vcl/inc/unx/gtk/gtkgdi.hxx | 6 +++---
vcl/inc/unx/gtk/gtkinst.hxx | 6 +++---
vcl/inc/unx/gtk/gtkobject.hxx | 4 ++--
vcl/inc/unx/gtk/gtkprn.hxx | 6 +++---
vcl/inc/unx/gtk/gtksalmenu.hxx | 6 +++---
vcl/inc/unx/gtk/gtksys.hxx | 6 +++---
vcl/inc/unx/i18n_cb.hxx | 6 +++---
vcl/inc/unx/i18n_ic.hxx | 6 +++---
vcl/inc/unx/i18n_im.hxx | 6 +++---
vcl/inc/unx/i18n_keysym.hxx | 6 +++---
vcl/inc/unx/i18n_status.hxx | 6 +++---
vcl/inc/unx/i18n_xkb.hxx | 6 +++---
vcl/inc/unx/kde/kdedata.hxx | 6 +++---
vcl/inc/unx/saltype.h | 6 +++---
vcl/inc/unx/salunx.h | 4 ++--
vcl/inc/unx/salunxtime.h | 6 +++---
vcl/inc/unx/sm.hxx | 4 ++--
vcl/inc/unx/wmadaptor.hxx | 4 ++--
vcl/inc/unx/x11/x11sys.hxx | 6 +++---
vcl/inc/vclpluginapi.h | 4 ++--
vcl/inc/wall2.hxx | 6 +++---
vcl/inc/win/wincomp.hxx | 6 +++---
vcl/inc/window.h | 6 +++---
vcl/inc/xconnection.hxx | 6 +++---
vcl/source/control/thumbpos.hxx | 6 +++---
vcl/source/edit/textdat2.hxx | 6 +++---
vcl/source/edit/textdoc.hxx | 6 +++---
vcl/source/edit/textund2.hxx | 6 +++---
vcl/source/edit/textundo.hxx | 6 +++---
vcl/source/filter/FilterConfigCache.hxx | 6 +++---
vcl/source/filter/igif/decode.hxx | 4 ++--
vcl/source/filter/igif/gifread.hxx | 6 +++---
vcl/source/filter/ixbm/xbmread.hxx | 6 +++---
vcl/source/filter/ixpm/xpmread.hxx | 6 +++---
vcl/source/filter/jpeg/Exif.hxx | 6 +++---
vcl/source/filter/jpeg/JpegReader.hxx | 6 +++---
vcl/source/filter/jpeg/JpegTransform.hxx | 4 ++--
vcl/source/filter/jpeg/JpegWriter.hxx | 6 +++---
vcl/source/filter/jpeg/jpeg.h | 4 ++--
vcl/source/filter/sgfbram.hxx | 6 +++---
vcl/source/filter/sgffilt.hxx | 6 +++---
vcl/source/filter/sgvmain.hxx | 6 +++---
vcl/source/filter/sgvspln.hxx | 6 +++---
vcl/source/filter/wmf/emfwr.hxx | 6 +++---
vcl/source/filter/wmf/winmtf.hxx | 4 ++--
vcl/source/filter/wmf/wmfwr.hxx | 4 ++--
vcl/source/fontsubset/gsub.h | 6 +++---
vcl/source/fontsubset/ttcr.hxx | 6 +++---
vcl/source/fontsubset/xlat.hxx | 6 +++---
vcl/source/gdi/impanmvw.hxx | 4 ++--
vcl/source/gdi/impvect.hxx | 4 ++--
vcl/source/gdi/pdffontcache.hxx | 4 ++--
vcl/source/gdi/pdfwriter_impl.hxx | 4 ++--
vcl/unx/generic/dtrans/X11_clipboard.hxx | 4 ++--
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 6 +++---
vcl/unx/generic/dtrans/X11_selection.hxx | 4 ++--
vcl/unx/generic/dtrans/X11_transferable.hxx | 4 ++--
vcl/unx/generic/dtrans/bmp.hxx | 4 ++--
vcl/unx/generic/gdi/gcach_xpeer.hxx | 6 +++---
vcl/unx/generic/gdi/xrender_peer.hxx | 6 +++---
vcl/unx/generic/window/FWS.hxx | 6 +++---
vcl/unx/gtk/a11y/atkfactory.hxx | 4 ++--
vcl/unx/gtk/a11y/atklistener.hxx | 6 +++---
vcl/unx/gtk/a11y/atkregistry.hxx | 4 ++--
vcl/unx/gtk/a11y/atktextattributes.hxx | 4 ++--
vcl/unx/gtk/a11y/atkutil.hxx | 4 ++--
vcl/unx/gtk/a11y/atkwindow.hxx | 4 ++--
vcl/unx/gtk/a11y/atkwrapper.hxx | 6 +++---
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 6 +++---
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 6 +++---
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 4 ++--
vcl/unx/gtk/inc/gtkprintwrapper.hxx | 6 +++---
vcl/unx/gtk3/inc/gtkprintwrapper.hxx | 6 +++---
vcl/unx/kde/UnxCommandThread.hxx | 6 +++---
vcl/unx/kde/UnxFilePicker.hxx | 6 +++---
vcl/unx/kde/UnxNotifyThread.hxx | 6 +++---
vcl/unx/kde/fpicker/kdecommandthread.hxx | 6 +++---
vcl/unx/kde/fpicker/kdefilepicker.hxx | 6 +++---
vcl/unx/kde/fpicker/kdemodalityfilter.hxx | 6 +++---
801 files changed, 1902 insertions(+), 1984 deletions(-)
New commits:
commit 9d1fd7936d02510e7a7a4c887f48ace4b5bb251f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Oct 28 15:14:36 2013 +0100
idl: remove invalid <member> tag
Change-Id: I20f5d95d5b728029aaa60b635e35f07c8422707d
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index b1fa80a..0789870 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -455,11 +455,11 @@ published service Content
<td>
Adds a new properties to the content.
<p>
- <member>PropertyCommandArgument::Property</member>
+ PropertyCommandArgument::Property
contains information about the property to be added.
- <member>PropertyCommandArgument::DefaultValue</member>
+ PropertyCommandArgument::DefaultValue
may contain the default value for the property. Its type must
- match the one specified in <member scope="com::sun::star::beans">Property::Type</member>.
+ match the one specified in com::sun::star::beans::Property::Type.
</p>
<p>Note that the dynamic properties must be kept persistent. The
service Store (UCB persistence service) may be used to
@@ -488,7 +488,7 @@ published service Content
if the Name of the property is empty.</p>
<blockquote>
Note: This command is new since Apache OpenOffice 4.0, LibreOffice 4.2 and replaces the deprecated interface method
- <member scope="com::sun::star::beans">XPropertyContainer::addProperty</member>.
+ com::sun::star::beans::XPropertyContainer::addProperty.
</blockquote>
</td>
</tr>
@@ -503,7 +503,7 @@ published service Content
if the property is not removable.</p>
<blockquote>
Note: This command is new since Apache OpenOffice 4.0, LibreOffice 4.2 and replaces the deprecated interface method
- <member scope="com::sun::star::beans">XPropertyContainer::removeProperty</member>.
+ com::sun::star::beans::XPropertyContainer::removeProperty.
</blockquote>
</td>
</tr>
commit a346904323fd3f38bffa2cc07d7f581caab1b434
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Oct 28 15:03:17 2013 +0100
shell: just define _WIN32_IE and drop the undef
Because the compiler warns either way.
cl : Command line warning D9025 : overriding ´/D_WIN32_IE=0x0500´ with
´/U_WIN32_IE´
After this change the message what's overwritten gets more
clear to the reader.
Change-Id: I773e7499537aff879f857b9b50ec8afc4005130b
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 88f1783..d225deb 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -22,9 +22,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
-D_UNICODE \
))
$(eval $(call gb_Library_add_defs,ooofilt,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
-UNOMINMAX \
))
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 51b2015..cf12f73 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,ooofilt_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index d421ea9..36bc9f7 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,propertyhdl,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index b3104b1..72a9b51 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,propertyhdl_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 5d0fad6..a19de73 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,shlxthdl,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index d3cb6b8..595263f 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,shlxthdl_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index ff75ba2..d2c9c8d 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -22,9 +22,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-D_UNICODE \
))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index b156ccb..17d6014 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -28,9 +28,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-D_UNICODE \
))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
commit e22242fddb73f5eadb11f340c314bbc4a6cfe361
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Oct 28 04:06:23 2013 +0100
fixincludeguards.sh: vcl
Change-Id: I3858c2152267474afab8e5a72b9f5da0ac623012
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 95c36c1..c92473c 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11ACTIONWRAPPER_H
-#define _SV_AQUA11ACTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
+(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
@end
-#endif // _SV_AQUA11ACTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index 85c59b9..74d804e 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11COMPONENTWRAPPER_H
-#define _SV_AQUA11COMPONENTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -34,6 +34,6 @@
+(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11COMPONENTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 4e7cc11..a889683 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA11YFOCUSLISTENER_HXX_
-#define _AQUA11YFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
#include <salhelper/refobj.hxx>
@@ -49,6 +49,6 @@ public:
virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
};
-#endif // _AQUA11YFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index fdbbcc1..a45cde4 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11ROLEHELPER_H
-#define _SV_AQUA11ROLEHELPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
#include "aqua/salinst.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -31,6 +31,6 @@
+(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
@end
-#endif // _SV_AQUA11ROLEHELPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index 8a43577..af3c297 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11SELECTIONWRAPPER_H
-#define _SV_AQUA11SELECTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -32,6 +32,6 @@
+(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11SELECTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index d6d0b39..09b3ff7 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TABLEWRAPPER_H
-#define _SV_AQUA11TABLEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
#include "aqua/aqua11ywrapper.h"
@@ -33,6 +33,6 @@
-(id)rowsAttribute;
-(id)columnsAttribute;
@end
-#endif // _SV_AQUA11TABLEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index 407c907..4464bd3 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
-#define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
#include "aqua/aqua11ywrapper.h"
@@ -27,6 +27,6 @@
}
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
@end
-#endif // _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index c5ee680..91b2bd9 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TEXTWRAPPER_H
-#define _SV_AQUA11TEXTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -53,6 +53,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11TEXTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index 0e49079..6f597dc 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11YUTIL_H
-#define _SV_AQUA11YUTIL_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
#include <com/sun/star/awt/Point.hpp>
@@ -28,5 +28,5 @@
+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
@end
-#endif // _SV_AQUA11YUTIL_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index a0136d9..6aa2eab 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11VALUEWRAPPER_H
-#define _SV_AQUA11VALUEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
#include "aqua/salinst.h"
#include "aqua/aquavcltypes.h"
@@ -35,6 +35,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11VALUEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index bce043a..ecb747f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERBUTTON_H
-#define _SV_AQUA11WRAPPERBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERBUTTON_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 8aa45fe..90433dd 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERCHECKBOX_H
-#define _SV_AQUA11WRAPPERCHECKBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
#include "aqua/aqua11ywrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index a368d13..6c8c1fe 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERCOMBOBOX_H
-#define _SV_AQUA11WRAPPERCOMBOBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
#include "aqua/aqua11ywrapper.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -39,6 +39,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERCOMBOBOX_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 91c3468..d018927 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERGROUP_H
-#define _SV_AQUA11WRAPPERGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index 1ae72a6..14fc22b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERLIST_H
-#define _SV_AQUA11WRAPPERLIST_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERLIST_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 6e09b9e..15943ef 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H
-#define _SV_AQUA11WRAPPERRADIOBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
#include "aqua/aqua11ywrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index 2b6f6c0..fa7b64d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERROW_H
-#define _SV_AQUA11WRAPPERROW_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERROW_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index d0dc100..e58acb2 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSCROLLAREA_H
-#define _SV_AQUA11WRAPPERSCROLLAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSCROLLAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index f417069..c2ca6d9 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSCROLLBAR_H
-#define _SV_AQUA11WRAPPERSCROLLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSCROLLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index 0c651fc..27eaa9b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSPLITTER_H
-#define _SV_AQUA11WRAPPERSPLITTER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSPLITTER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index e6f75d87..627d6e3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSTATICTEXT_H
-#define _SV_AQUA11WRAPPERSTATICTEXT_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSTATICTEXT_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 3b3f960..bd0937e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTABGROUP_H
-#define _SV_AQUA11WRAPPERTABGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTABGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 6290f15..e39fcdc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTEXTAREA_H
-#define _SV_AQUA11WRAPPERTEXTAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTEXTAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index 5bea6d0..6c38821 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTOOLBAR_H
-#define _SV_AQUA11WRAPPERTOOLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTOOLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 04dd215..1baba33 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCUMENTFOCUSLISTENER_HXX_
-#define _DOCUMENTFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
@@ -87,5 +87,5 @@ private:
AquaA11yFocusTracker& m_aFocusTracker;
};
-#endif // _DOCUMENTFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index a7ae636..f5c579e 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DATAFLAVORMAPPING_HXX_
-#define INCLUDED_DATAFLAVORMAPPING_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 2932a83..be4443a 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAGSOURCE_HXX_
-#define _DRAGSOURCE_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 100edef..6d8d0d9 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAGSOURCECONTEXT_HXX_
-#define _DRAGSOURCECONTEXT_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 9889438..9318d80 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DROPTARGET_HXX_
-#define _DROPTARGET_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
#include "DataFlavorMapping.hxx"
#include <cppuhelper/compbase5.hxx>
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
index 251961b..393aed8 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_HTMLFMTFLT_HXX
-#define INCLUDED_HTMLFMTFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index abff9a8..65a7771 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_PICTTOBMPFLT_HXX
-#define INCLUDED_PICTTOBMPFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 2e76705..ba0aecd 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA_CLIPBOARD_HXX_
-#define _AQUA_CLIPBOARD_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
#include "DataFlavorMapping.hxx"
#include <rtl/ustring.hxx>
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index e2527b3..f4abb2f 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GCACHFTYP_HXX
-#define _SV_GCACHFTYP_HXX
+#ifndef INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
+#define INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
#include "generic/glyphcache.hxx"
@@ -176,6 +176,6 @@ public:
// -----------------------------------------------------------------------
-#endif // _SV_GCACHFTYP_HXX
+#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index a062bb8..0225109 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_GLYPHSET_HXX_
-#define _PSPRINT_GLYPHSET_HXX_
+#ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
+#define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
#include "vcl/fontmanager.hxx"
diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx
index 55e3d3b..e085f470 100644
--- a/vcl/generic/print/psputil.hxx
+++ b/vcl/generic/print/psputil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_PRINTERUTIL_HXX_
-#define _PSPRINT_PRINTERUTIL_HXX_
+#ifndef INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
+#define INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
#include "osl/file.hxx"
@@ -65,6 +65,6 @@ ConverterFactory& GetConverterFactory ();
} /* namespace psp */
-#endif /* _PSPRINT_PRINTERUTIL_HXX_ */
+#endif // INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h
index 2225e29..b2bef1a 100644
--- a/vcl/inc/accel.h
+++ b/vcl/inc/accel.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_ACCEL_H
-#define _SV_ACCEL_H
+#ifndef INCLUDED_VCL_INC_ACCEL_H
+#define INCLUDED_VCL_INC_ACCEL_H
#include <tools/solar.h>
#include <vcl/keycod.hxx>
@@ -37,6 +37,6 @@ public:
void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
-#endif // _SV_ACCEL_H
+#endif // INCLUDED_VCL_INC_ACCEL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index 8d089ae..e4c59b7 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_ACCMGR_HXX
-#define _SV_ACCMGR_HXX
+#ifndef INCLUDED_VCL_INC_ACCMGR_HXX
+#define INCLUDED_VCL_INC_ACCMGR_HXX
#include <tools/solar.h>
#include <vector>
@@ -55,6 +55,6 @@ public:
sal_Bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat );
};
-#endif // _SV_ACCMGR_HXX
+#endif // INCLUDED_VCL_INC_ACCMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 64dfc6a..76067ef 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef ANDROID_SALINST_H
-#define ANDROID_SALINST_H
+#ifndef INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX
+#define INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX
#include <jni.h>
#include <android/input.h>
@@ -48,6 +48,6 @@ public:
void damaged(AndroidSalFrame *frame);
};
-#endif // ANDROID_SALINST_H
+#endif // INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/android/svsys.h b/vcl/inc/android/svsys.h
index a9df68a..25fac68 100644
--- a/vcl/inc/android/svsys.h
+++ b/vcl/inc/android/svsys.h
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_ANDROID_SVSYS_H
-#define _VCL_ANDROID_SVSYS_H
+#ifndef INCLUDED_VCL_INC_ANDROID_SVSYS_H
+#define INCLUDED_VCL_INC_ANDROID_SVSYS_H
// ?
-#endif // _VCL_ANDROID_SVSYS_H
+#endif // INCLUDED_VCL_INC_ANDROID_SVSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h
index dc7a71d..2a4a7dc 100644
--- a/vcl/inc/aqua/aqua11yfactory.h
+++ b/vcl/inc/aqua/aqua11yfactory.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11FACTORY_H
-#define _SV_AQUA11FACTORY_H
+#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
+#define INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
#include "aquavcltypes.h"
#include "aqua11ywrapper.h"
@@ -36,6 +36,6 @@
+(void)registerView: (NSView *) theView;
+(void)revokeView: (NSView *) theViewt;
@end
-#endif // _SV_AQUA11FACTORY_H
+#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx
index 8e54013..22896c2 100644
--- a/vcl/inc/aqua/aqua11yfocustracker.hxx
+++ b/vcl/inc/aqua/aqua11yfocustracker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA11YFOCUSTRACKER_HXX_
-#define _AQUA11YFOCUSTRACKER_HXX_
+#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
+#define INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -95,6 +95,6 @@ private:
const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
};
-#endif // _AQUA11YFOCUSTRACKER_HXX_
+#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx
index 100e09a..97c71ef 100644
--- a/vcl/inc/aqua/aqua11ylistener.hxx
+++ b/vcl/inc/aqua/aqua11ylistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA11YLISTENER_HXX_
-#define _AQUA11YLISTENER_HXX_
+#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
+#define INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -54,5 +54,5 @@ private:
::com::sun::star::awt::Rectangle m_oldBounds;
};
-#endif // _AQUA11YLISTENER_HXX_
+#endif // INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index d7767c1..95edcae 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPER_H
-#define _SV_AQUA11WRAPPER_H
+#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
+#define INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
#include "aquavcltypes.h"
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
@@ -105,6 +105,6 @@ struct ReferenceWrapper
-(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup;
@end
-#endif // _SV_AQUA11WRAPPER_H
+#endif // INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h
index e31d24d..fbd8077 100644
--- a/vcl/inc/aqua/aquaprintview.h
+++ b/vcl/inc/aqua/aquaprintview.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_AQUAPRINTVIEW_H
-#define _VCL_AQUAPRINTVIEW_H
+#ifndef INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
+#define INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h
index 7b45c4c..5101a5a 100644
--- a/vcl/inc/aqua/aquavcltypes.h
+++ b/vcl/inc/aqua/aquavcltypes.h
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUAVCLTYPES_H
-#define _AQUAVCLTYPES_H
+#ifndef INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
+#define INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
#include "premac.h"
#import <Cocoa/Cocoa.h>
#import <AppKit/NSEvent.h>
#include "postmac.h"
-#endif /* _AQUAVCLTYPES_H */
+#endif // INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/atsui/salatsuifontutils.hxx b/vcl/inc/aqua/atsui/salatsuifontutils.hxx
index 1258f54..f8920cd 100644
--- a/vcl/inc/aqua/atsui/salatsuifontutils.hxx
+++ b/vcl/inc/aqua/atsui/salatsuifontutils.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALATSUIFONTUTILS_HXX
-#define _SV_SALATSUIFONTUTILS_HXX
+#ifndef INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
+#define INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
class ImplMacFontData;
class ImplDevFontList;
@@ -51,6 +51,6 @@ private:
void InitGlyphFallbacks();
};
-#endif // _SV_SALATSUIFONTUTILS_HXX
+#endif // INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx
index 6549e20..45979e2 100644
--- a/vcl/inc/aqua/keyboardfocuslistener.hxx
+++ b/vcl/inc/aqua/keyboardfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _KEYBOARDFOCUSLISTENER_HXX_
-#define _KEYBOARDFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
+#define INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -34,5 +34,5 @@ public:
virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
};
-#endif // _KEYBOARDFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/aqua/salframeview.h
index 2387411..4be71b3 100644
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_SALFRAMEVIEW_H
-#define _VCL_SALFRAMEVIEW_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
+#define INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
#include "aqua/aqua11ywrapper.h"
diff --git a/vcl/inc/aqua/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx
index a4f2427..e3c223e 100644
--- a/vcl/inc/aqua/salmathutils.hxx
+++ b/vcl/inc/aqua/salmathutils.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALMATHUTILS_HXX
-#define _SV_SALMATHUTILS_HXX
+#ifndef INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
+#define INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
#ifdef __cplusplus
extern "C" {
@@ -76,6 +76,6 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec );
}
#endif
-#endif // _SV_SALMATHUTILS_HXX
+#endif // INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h
index f17ed36..5c67a82 100644
--- a/vcl/inc/aqua/salnativewidgets.h
+++ b/vcl/inc/aqua/salnativewidgets.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_NATIVEWIDGETS_H
-#define _SV_NATIVEWIDGETS_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
+#define INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
// since 10.4 ... no metrics are returned, and we have to fix the values
#define BUTTON_WIDTH 16
@@ -59,6 +59,6 @@
#define CLIP_FUZZ 1
-#endif // _SV_NATIVEWIDGETS_H
+#endif // INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h
index 966a837..5859612 100644
--- a/vcl/inc/aqua/salnsmenu.h
+++ b/vcl/inc/aqua/salnsmenu.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_SALNSMENU_H
-#define _VCL_SALNSMENU_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALNSMENU_H
+#define INCLUDED_VCL_INC_AQUA_SALNSMENU_H
class AquaSalMenu;
class AquaSalMenuItem;
diff --git a/vcl/inc/aqua/salnstimer.h b/vcl/inc/aqua/salnstimer.h
index fcbf0c2..3d05fc8 100644
--- a/vcl/inc/aqua/salnstimer.h
+++ b/vcl/inc/aqua/salnstimer.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 _VCL_SALNSTIMER_H
-#define _VCL_SALNSTIMER_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
+#define INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
#include "premac.h"
#include "Cocoa/Cocoa.h"
diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h
index 18114c2..7413361 100644
--- a/vcl/inc/aqua/vclnsapp.h
+++ b/vcl/inc/aqua/vclnsapp.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_VCLNSAPP_H
-#define _VCL_VCLNSAPP_H
+#ifndef INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
+#define INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
#include <config_features.h>
diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index 6796e17..a637d9f 100644
--- a/vcl/inc/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_BMPFAST_HXX
-#define _SV_BMPFAST_HXX
+#ifndef INCLUDED_VCL_INC_BMPFAST_HXX
+#define INCLUDED_VCL_INC_BMPFAST_HXX
class BitmapWriteAccess;
class BitmapReadAccess;
@@ -40,6 +40,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDst,
bool ImplFastEraseBitmap( BitmapBuffer&, const BitmapColor& );
-#endif // _SV_BMPFAST_HXX
+#endif // INCLUDED_VCL_INC_BMPFAST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index e89fdd0..71b67b6 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_BRDWIN_HXX
-#define _SV_BRDWIN_HXX
+#ifndef INCLUDED_VCL_INC_BRDWIN_HXX
+#define INCLUDED_VCL_INC_BRDWIN_HXX
#include <tools/solar.h>
#include <vcl/window.hxx>
@@ -339,6 +339,6 @@ public:
};
-#endif // _SV_BRDWIN_HXX
+#endif // INCLUDED_VCL_INC_BRDWIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 68deab2..3187dc9 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_CANVASBITMAP_HXX
-#define _VCL_CANVASBITMAP_HXX
+#ifndef INCLUDED_VCL_INC_CANVASBITMAP_HXX
+#define INCLUDED_VCL_INC_CANVASBITMAP_HXX
#include <cppuhelper/compbase3.hxx>
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 3b0e1eb..8040fa8 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef VCL_CONTROLDATA_HXX
-#define VCL_CONTROLDATA_HXX
+#ifndef INCLUDED_VCL_INC_CONTROLDATA_HXX
+#define INCLUDED_VCL_INC_CONTROLDATA_HXX
#include <vcl/controllayout.hxx>
@@ -51,6 +51,6 @@ namespace vcl
} // namespace vcl
//........................................................................
-#endif // VCL_CONTROLDATA_HXX
+#endif // INCLUDED_VCL_INC_CONTROLDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/coretext/common.h b/vcl/inc/coretext/common.h
index f26d48c..1f1211b 100644
--- a/vcl/inc/coretext/common.h
+++ b/vcl/inc/coretext/common.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_CORETEXT_COMMON_H
-#define _VCL_CORETEXT_COMMON_H
+#ifndef INCLUDED_VCL_INC_CORETEXT_COMMON_H
+#define INCLUDED_VCL_INC_CORETEXT_COMMON_H
#include <iostream>
@@ -48,6 +48,6 @@
std::ostream &operator <<(std::ostream& s, CTFontRef pFont);
-#endif /* _VCL_CORETEXT_COMMON_H */
+#endif // INCLUDED_VCL_INC_CORETEXT_COMMON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index ac040b0..8c659fe 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_CUPSMGR_HXX_
-#define _PSPRINT_CUPSMGR_HXX_
+#ifndef INCLUDED_VCL_INC_CUPSMGR_HXX
+#define INCLUDED_VCL_INC_CUPSMGR_HXX
#include "vcl/printerinfomanager.hxx"
#include "osl/module.h"
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
index c6597df..dd92f8e 100644
--- a/vcl/inc/cvtsvm.hxx
+++ b/vcl/inc/cvtsvm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_CVTSVM_HXX
-#define INCLUDED_VCL_CVTSVM_HXX
+#ifndef INCLUDED_VCL_INC_CVTSVM_HXX
+#define INCLUDED_VCL_INC_CVTSVM_HXX
#include <stack>
#include <vcl/dllapi.h>
@@ -97,6 +97,6 @@ private:
SVMConverter& operator=( const SVMConverter& );
};
-#endif // INCLUDED_VCL_CVTSVM_HXX
+#endif // INCLUDED_VCL_INC_CVTSVM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index c3393e6..9ee6dc2 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_DBGGUI_HXX
-#define _SV_DBGGUI_HXX
+#ifndef INCLUDED_VCL_INC_DBGGUI_HXX
+#define INCLUDED_VCL_INC_DBGGUI_HXX
#include <tools/solar.h>
@@ -54,6 +54,6 @@ void DbgDialogTest( Window* pWindow );
#endif
-#endif // _SV_DBGGUI_HXX
+#endif // INCLUDED_VCL_INC_DBGGUI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 182554a..223f672 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DNDEVDIS_HXX_
-#define _DNDEVDIS_HXX_
+#ifndef INCLUDED_VCL_INC_DNDEVDIS_HXX
+#define INCLUDED_VCL_INC_DNDEVDIS_HXX
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index f8a099b..dcda3c5 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DNDLCON_HXX_
-#define _DNDLCON_HXX_
+#ifndef INCLUDED_VCL_INC_DNDLCON_HXX
+#define INCLUDED_VCL_INC_DNDLCON_HXX
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index a2b5b8a..d70b641 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_FONTCACHE_HXX
-#define _PSPRINT_FONTCACHE_HXX
+#ifndef INCLUDED_VCL_INC_FONTCACHE_HXX
+#define INCLUDED_VCL_INC_FONTCACHE_HXX
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
@@ -84,6 +84,6 @@ public:
} // namespace psp
-#endif // _PSPRINT_FONTCACHE_HXX
+#endif // INCLUDED_VCL_INC_FONTCACHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 4f00487..a827a95 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_FONTSUBSET_HXX
-#define _SV_FONTSUBSET_HXX
+#ifndef INCLUDED_VCL_INC_FONTSUBSET_HXX
+#define INCLUDED_VCL_INC_FONTSUBSET_HXX
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
@@ -87,6 +87,6 @@ protected:
bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
};
-#endif // _SV_FONTSUBSET_HXX
+#endif // INCLUDED_VCL_INC_FONTSUBSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 6783c36..ec587ce 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _SV_GENDATA_HXX
-#define _SV_GENDATA_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GENDATA_HXX
+#define INCLUDED_VCL_INC_GENERIC_GENDATA_HXX
#include <osl/socket.hxx>
#include <saldatabasic.hxx>
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index 9e603b9..285a9dc 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GEN_DISP_HXX
-#define _VCL_GEN_DISP_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
+#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
#include <sal/types.h>
#include <osl/mutex.h>
@@ -75,6 +75,6 @@ public:
};
-#endif // _VCL_GEN_DISP_HXX
+#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index acbe1d4..59ac04f 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GENERIC_INST_H
-#define _SV_GENERIC_INST_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENINST_H
+#define INCLUDED_VCL_INC_GENERIC_GENINST_H
#include <tools/solar.h>
#include <osl/thread.hxx>
@@ -118,6 +118,6 @@ inline SalGenericInstance *GetGenericInstance()
return static_cast<SalGenericInstance *>(GetSalData()->m_pInstance);
}
-#endif // _SV_GENERIC_INST_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENINST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 698cc3e..00e061e 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GENERIC_PRN_H
-#define _SV_GENERIC_PRN_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
+#define INCLUDED_VCL_INC_GENERIC_GENPRN_H
#include "vcl/jobdata.hxx"
#include "generic/printergfx.hxx"
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 636606e..74ccf65 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GENPSPGRAPHICS_H
-#define _VCL_GENPSPGRAPHICS_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
+#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
#include "vcl/fontmanager.hxx"
@@ -191,6 +191,6 @@ public:
virtual SystemFontData GetSysFontData( int nFallbacklevel ) const;
};
-#endif // _VCL_GENPSPGRAPHICS_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index 25d73a0..77ff2ed 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GENSYS_H
-#define _SV_GENSYS_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENSYS_H
+#define INCLUDED_VCL_INC_GENERIC_GENSYS_H
#include <salsys.hxx>
#include <salframe.hxx>
@@ -50,6 +50,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
#endif
};
-#endif // _SV_GENSYS_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 7e1acaf..452cf4b 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GLYPHCACHE_HXX
-#define _SV_GLYPHCACHE_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
+#define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
#include <vcl/dllapi.h>
@@ -368,6 +368,6 @@ public:
int mnYOffset;
};
-#endif // _SV_GLYPHCACHE_HXX
+#endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 94848cb..48f759b 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_PRINTERGFX_HXX_
-#define _PSPRINT_PRINTERGFX_HXX_
+#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
+#define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
#include "vcl/helper.hxx"
#include "sallayout.hxx"
@@ -412,6 +412,6 @@ public:
} /* namespace psp */
-#endif /* _PSPRINT_PRINTERGFX_HXX_ */
+#endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index b60cc09..5c521bb 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_PRINTERJOB_HXX_
-#define _PSPRINT_PRINTERJOB_HXX_
+#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
+#define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
#include "vcl/jobdata.hxx"
#include "osl/file.hxx"
@@ -132,6 +132,6 @@ public:
} /* namespace psp */
-#endif /* _PSPRINT_PRINTERJOB_HXX_ */
+#endif // INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index b810834..434d6f6 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GRAPHITELAYOUT_HXX
-#define _SV_GRAPHITELAYOUT_HXX
+#ifndef INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX
+#define INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX
// Description: An implementation of the SalLayout interface that uses the
// Graphite engine.
@@ -158,6 +158,6 @@ private:
long & rDXOffset, bool bIsBase, int baseChar);
};
-#endif // _SV_GRAPHITELAYOUT_HXX
+#endif // INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index cfd2cd6..e21590a 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GRAPHITESERVERFONT_HXX
-#define _SV_GRAPHITESERVERFONT_HXX
+#ifndef INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX
+#define INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX
// We need this to enable namespace support in libgrengine headers.
#define GR_NAMESPACE
@@ -95,6 +95,6 @@ public:
};
#endif
-#endif //_SV_GRAPHITESERVERFONT_HXX
+#endif // INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index d081e2e..861e53e 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SVP_SVBMP_HXX
-#define SVP_SVBMP_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
#include "sal/config.h"
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 84cdf0e..157f6a0 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SVPDUMMIES_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
#include <vcl/sysdata.hxx>
#include <generic/gensys.h>
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 6485330..f5fe6dd 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SVPFRAME_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
#include <vcl/sysdata.hxx>
#include <basegfx/range/b2ibox.hxx>
@@ -135,6 +135,6 @@ public:
static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; }
};
-#endif // _SVP_SVPFRAME_HXX
+#endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 13f8b1a..c36cfd3 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SVPGDI_HXX
-#define _SVP_SVPGDI_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/color.hxx>
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index af0c680..d0e6a6e 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SALINST_HXX
-#define _SVP_SALINST_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
#include <vcl/solarmutex.hxx>
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 266c029..d9ac08f 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SVPPRN_HXX
-#define _SVP_SVPPRN_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
#include "vcl/jobdata.hxx"
#include "generic/printergfx.hxx"
@@ -39,6 +39,6 @@ public:
SvpSalPrinter( SalInfoPrinter* pInfoPrinter );
};
-#endif // _SVP_SVPPRN_HXX
+#endif // INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 2bb850d..6a0b031 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVP_SVPVD_HXX
-#define _SVP_SVPVD_HXX
+#ifndef INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
#include <salvd.hxx>
@@ -49,6 +49,6 @@ public:
virtual void GetSize( long& rWidth, long& rHeight );
};
-#endif // _SVP_SVPVD_HXX
+#endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 6923c2b..389c814 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_HELPWIN_HXX
-#define _SV_HELPWIN_HXX
+#ifndef INCLUDED_VCL_INC_HELPWIN_HXX
+#define INCLUDED_VCL_INC_HELPWIN_HXX
#include <vcl/floatwin.hxx>
#include <vcl/timer.hxx>
@@ -79,6 +79,6 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime );
void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
const Point& rPos, const Rectangle* pHelpArea );
-#endif // _SV_HELPWIN_HXX
+#endif // INCLUDED_VCL_INC_HELPWIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 03d21e9..527d76f 100644
--- a/vcl/inc/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IDLEMGR_HXX
-#define _SV_IDLEMGR_HXX
+#ifndef INCLUDED_VCL_INC_IDLEMGR_HXX
+#define INCLUDED_VCL_INC_IDLEMGR_HXX
#include <tools/solar.h>
#include <vcl/timer.hxx>
@@ -51,6 +51,6 @@ public:
DECL_LINK(TimeoutHdl, void *);
};
-#endif // _SV_IDLEMGR_HXX
+#endif // INCLUDED_VCL_INC_IDLEMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 9edb315..315f4ce 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_ILSTBOX_HXX
-#define _SV_ILSTBOX_HXX
+#ifndef INCLUDED_VCL_INC_ILSTBOX_HXX
+#define INCLUDED_VCL_INC_ILSTBOX_HXX
#include <boost/ptr_container/ptr_vector.hpp>
@@ -654,6 +654,6 @@ public:
void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
void ImplInitDropDownButton( PushButton* pButton );
-#endif // _SV_ILSTBOX_HXX
+#endif // INCLUDED_VCL_INC_ILSTBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index ec12a3d..a59c865 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMAGE_H
-#define _SV_IMAGE_H
+#ifndef INCLUDED_VCL_INC_IMAGE_H
+#define INCLUDED_VCL_INC_IMAGE_H
#include <vcl/bitmapex.hxx>
@@ -156,6 +156,6 @@ private: // prevent assignment and copy construction
void operator=( const ImplImage&);
};
-#endif // _SV_IMAGE_H
+#endif // INCLUDED_VCL_INC_IMAGE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index e5b7855..fa48db1 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPBMP_HXX
-#define _SV_IMPBMP_HXX
+#ifndef INCLUDED_VCL_INC_IMPBMP_HXX
+#define INCLUDED_VCL_INC_IMPBMP_HXX
#include <tools/gen.hxx>
#include <tools/solar.h>
@@ -90,6 +90,6 @@ inline void ImpBitmap::ImplSetSourceSize( const Size& rSize)
maSourceSize = rSize;
}
-#endif // _SV_IMPBMP_HXX
+#endif // INCLUDED_VCL_INC_IMPBMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 8abdd35..b464ee5 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPFONT_HXX
-#define _SV_IMPFONT_HXX
+#ifndef INCLUDED_VCL_INC_IMPFONT_HXX
+#define INCLUDED_VCL_INC_IMPFONT_HXX
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
@@ -232,6 +232,6 @@ bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& );
-#endif // _SV_IMPFONT_HXX
+#endif // INCLUDED_VCL_INC_IMPFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 4c879d6..8ccabf6 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPGRAPH_HXX
-#define _SV_IMPGRAPH_HXX
+#ifndef INCLUDED_VCL_INC_IMPGRAPH_HXX
+#define INCLUDED_VCL_INC_IMPGRAPH_HXX
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
@@ -167,6 +167,6 @@ private:
const SvgDataPtr& getSvgData() const;
};
-#endif // _SV_IMPGRAPH_HXX
+#endif // INCLUDED_VCL_INC_IMPGRAPH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index a24faaa..68cb241 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_IMPIMAGETREE_HXX
-#define INCLUDED_VCL_IMPIMAGETREE_HXX
+#ifndef INCLUDED_VCL_INC_IMPIMAGETREE_HXX
+#define INCLUDED_VCL_INC_IMPIMAGETREE_HXX
#include "sal/config.h"
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index 860a898..3fc916a 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPOCT_HXX
-#define _SV_IMPOCT_HXX
+#ifndef INCLUDED_VCL_INC_IMPOCT_HXX
+#define INCLUDED_VCL_INC_IMPOCT_HXX
#include <vcl/octree.hxx>
@@ -168,6 +168,6 @@ inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode )
pActNode = pNode;
}
-#endif // _SV_IMPOCT_HXX
+#endif // INCLUDED_VCL_INC_IMPOCT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 58f0648..5d4ad0c 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IOS_SALINST_H
-#define IOS_SALINST_H
+#ifndef INCLUDED_VCL_INC_IOS_IOSINST_HXX
+#define INCLUDED_VCL_INC_IOS_IOSINST_HXX
#include <pthread.h>
@@ -78,6 +78,6 @@ public:
pthread_cond_t m_aRenderCond;
};
-#endif // IOS_SALINST_H
+#endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h
index 9e4d048..b476b74 100644
--- a/vcl/inc/ios/svsys.h
+++ b/vcl/inc/ios/svsys.h
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_IOS_SVSYS_H
-#define _VCL_IOS_SVSYS_H
+#ifndef INCLUDED_VCL_INC_IOS_SVSYS_H
+#define INCLUDED_VCL_INC_IOS_SVSYS_H
// ?
-#endif // _VCL_IOS_SVSYS_H
+#endif // INCLUDED_VCL_INC_IOS_SVSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 262e8b5..9914312 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_JOBSET_H
-#define _SV_JOBSET_H
+#ifndef INCLUDED_VCL_INC_JOBSET_H
+#define INCLUDED_VCL_INC_JOBSET_H
#include <tools/solar.h>
#include <vcl/prntypes.hxx>
@@ -67,6 +67,6 @@ struct ImplJobSetup
// Papierbreite/hoehe wird wenn 0 im unabhaengigen Teil automatisch aus
// Papierformat berechnet, wenn dieses ungleich PAPER_USER ist
-#endif // _SV_JOBSET_H
+#endif // INCLUDED_VCL_INC_JOBSET_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/langboost.hxx b/vcl/inc/langboost.hxx
index f612cba..84bdb2d 100644
--- a/vcl/inc/langboost.hxx
+++ b/vcl/inc/langboost.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_LANGBOOST_HXX
-#define _VCL_LANGBOOST_HXX
+#ifndef INCLUDED_VCL_INC_LANGBOOST_HXX
+#define INCLUDED_VCL_INC_LANGBOOST_HXX
namespace vcl
{
diff --git a/vcl/inc/list.h b/vcl/inc/list.h
index 733bb19..b195910 100644
--- a/vcl/inc/list.h
+++ b/vcl/inc/list.h
@@ -25,8 +25,8 @@
/*| Author: Alexander Gelfenbain |*/
/*[]---------------------------------------------------[]*/
-#ifndef __CLIST_H
-#define __CLIST_H
+#ifndef INCLUDED_VCL_INC_LIST_H
+#define INCLUDED_VCL_INC_LIST_H
#ifdef __cplusplus
extern "C"
@@ -85,6 +85,6 @@ extern "C"
#endif
-#endif /* __CLIST_H */
+#endif // INCLUDED_VCL_INC_LIST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx
index f5e2ab7..fde89ef 100644
--- a/vcl/inc/outdata.hxx
+++ b/vcl/inc/outdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_OUTDATA_HXX
-#define _SV_OUTDATA_HXX
+#ifndef INCLUDED_VCL_INC_OUTDATA_HXX
+#define INCLUDED_VCL_INC_OUTDATA_HXX
#include <tools/solar.h>
#include <tools/color.hxx>
@@ -38,6 +38,6 @@ inline int ImplIsColorTransparent( Color aColor )
return aColor.GetTransparency();
}
-#endif // _SV_OUTDATA_HXX
+#endif // INCLUDED_VCL_INC_OUTDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 6291866..226a83d 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_OUTDEV_H
-#define _SV_OUTDEV_H
+#ifndef INCLUDED_VCL_INC_OUTDEV_H
+#define INCLUDED_VCL_INC_OUTDEV_H
#include <tools/solar.h>
#include <outfont.hxx>
@@ -245,6 +245,6 @@ struct ImplOutDevData
basegfx::B2DHomMatrix* mpInverseViewTransform;
};
-#endif // _SV_OUTDEV_H
+#endif // INCLUDED_VCL_INC_OUTDEV_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 6e3210b..eb3c480 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_OUTFONT_HXX
-#define _SV_OUTFONT_HXX
+#ifndef INCLUDED_VCL_INC_OUTFONT_HXX
+#define INCLUDED_VCL_INC_OUTFONT_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -410,6 +410,6 @@ private:
ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& );
};
-#endif // _SV_OUTFONT_HXX
+#endif // INCLUDED_VCL_INC_OUTFONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index bd642c6..4b56092 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_PRINT_H
-#define _SV_PRINT_H
+#ifndef INCLUDED_VCL_INC_PRINT_H
+#define INCLUDED_VCL_INC_PRINT_H
#include "tools/solar.h"
#include "vcl/dllapi.h"
@@ -72,6 +72,6 @@ void ImplDeletePrnQueueList();
void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
-#endif // _SV_PRINT_H
+#endif // INCLUDED_VCL_INC_PRINT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 618e2f9..3b07b6b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_PRNDLG_HXX
-#define _SV_PRNDLG_HXX
+#ifndef INCLUDED_VCL_INC_PRINTDLG_HXX
+#define INCLUDED_VCL_INC_PRINTDLG_HXX
#include <vcl/dllapi.h>
@@ -298,6 +298,6 @@ namespace vcl
}
-#endif // _SV_PRNDLG_HXX
+#endif // INCLUDED_VCL_INC_PRINTDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 24aebeb..8641fd9 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_QUARTZ_SALBMP_H
-#define _VCL_QUARTZ_SALBMP_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALBMP_H
+#define INCLUDED_VCL_INC_QUARTZ_SALBMP_H
#include "tools/gen.hxx"
@@ -100,6 +100,6 @@ public:
CGImageRef CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const;
};
-#endif // _VCL_QUARTZ_SALBMP_H
+#endif // INCLUDED_VCL_INC_QUARTZ_SALBMP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index c8a1819..c20f991 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_AQUA_SALGDICOMMON_H
-#define _VCL_AQUA_SALGDICOMMON_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
+#define INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
#include <premac.h>
#ifdef IOS
@@ -89,4 +89,4 @@ private:
bool m_bIsEnabled;
};
-#endif /* _VCL_AQUA_SALGDICOMMON_H */
+#endif // INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h
index 28cc508..fe81c1d 100644
--- a/vcl/inc/quartz/utils.h
+++ b/vcl/inc/quartz/utils.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_QUARTZ_UTILS_HXX
-#define INCLUDED_QUARTZ_UTILS_HXX
+#ifndef INCLUDED_VCL_INC_QUARTZ_UTILS_H
+#define INCLUDED_VCL_INC_QUARTZ_UTILS_H
#include <iostream>
@@ -44,6 +44,6 @@ std::ostream &operator <<(std::ostream& s, CGPoint &rPoint);
std::ostream &operator <<(std::ostream& s, CGSize &rSize);
std::ostream &operator <<(std::ostream& s, CGColorRef pSize);
-#endif // INCLUDED_QUARTZ_UTILS_HXX
+#endif // INCLUDED_VCL_INC_QUARTZ_UTILS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 8965703..c913cc8 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -15,8 +15,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 _SV_REGIONBAND_HXX
-#define _SV_REGIONBAND_HXX
+#ifndef INCLUDED_VCL_INC_REGIONBAND_HXX
+#define INCLUDED_VCL_INC_REGIONBAND_HXX
#include <vcl/regband.hxx>
#include <vcl/region.hxx>
@@ -77,7 +77,7 @@ public:
void GetRegionRectangles(RectangleVector& rTarget) const;
};
-#endif // _SV_REGIONBAND_HXX
+#endif // INCLUDED_VCL_INC_REGIONBAND_HXX
//////////////////////////////////////////////////////////////////////////////
//eof
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 42d95d7..8c9886e 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALDATABASIC_HXX
-#define _SV_SALDATABASIC_HXX
+#ifndef INCLUDED_VCL_INC_SALDATABASIC_HXX
+#define INCLUDED_VCL_INC_SALDATABASIC_HXX
#include <svdata.hxx>
#include <salinst.hxx>
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 531d0d4..3712cd7 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALFRAME_HXX
-#define _SV_SALFRAME_HXX
+#ifndef INCLUDED_VCL_INC_SALFRAME_HXX
+#define INCLUDED_VCL_INC_SALFRAME_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
@@ -243,6 +243,6 @@ public: // public for Sal Implementation
{ return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
};
-#endif // _SV_SALFRAME_HXX
+#endif // INCLUDED_VCL_INC_SALFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d0edf59..323c66a 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALGDI_HXX
-#define _SV_SALGDI_HXX
+#ifndef INCLUDED_VCL_INC_SALGDI_HXX
+#define INCLUDED_VCL_INC_SALGDI_HXX
#include "tools/solar.h"
#include "vcl/dllapi.h"
@@ -506,6 +506,6 @@ public:
virtual SystemFontData GetSysFontData( int nFallbacklevel ) const = 0;
};
-#endif // _SV_SALGDI_HXX
+#endif // INCLUDED_VCL_INC_SALGDI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx
index d054a7e..138a6d9 100644
--- a/vcl/inc/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALGEOM_HXX
-#define _SV_SALGEOM_HXX
+#ifndef INCLUDED_VCL_INC_SALGEOM_HXX
+#define INCLUDED_VCL_INC_SALGEOM_HXX
typedef struct _SalFrameGeometry {
// screen position of upper left corner of drawable area in pixel
@@ -40,6 +40,6 @@ typedef struct _SalFrameGeometry {
{}
} SalFrameGeometry;
-#endif // _SV_SALGEOM_HXX
+#endif // INCLUDED_VCL_INC_SALGEOM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salimestatus.hxx b/vcl/inc/salimestatus.hxx
index f961a12..bf3488f 100644
--- a/vcl/inc/salimestatus.hxx
+++ b/vcl/inc/salimestatus.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALIMESTATUS_HXX
-#define _SV_SALIMESTATUS_HXX
+#ifndef INCLUDED_VCL_INC_SALIMESTATUS_HXX
+#define INCLUDED_VCL_INC_SALIMESTATUS_HXX
#include <vcl/dllapi.h>
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 3bfab2c..1f933a4 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALLAYOUT_HXX
-#define _SV_SALLAYOUT_HXX
+#ifndef INCLUDED_VCL_INC_SALLAYOUT_HXX
+#define INCLUDED_VCL_INC_SALLAYOUT_HXX
#include <iostream>
@@ -390,6 +390,6 @@ private:
#undef SalGraphics
-#endif // _SV_SALLAYOUT_HXX
+#endif // INCLUDED_VCL_INC_SALLAYOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index addedfd..2a15583 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALMENU_HXX
-#define _SV_SALMENU_HXX
+#ifndef INCLUDED_VCL_INC_SALMENU_HXX
+#define INCLUDED_VCL_INC_SALMENU_HXX
#include <tools/solar.h>
#include "vcl/dllapi.h"
@@ -92,6 +92,6 @@ public:
};
-#endif // _SV_SALMENU_HXX
+#endif // INCLUDED_VCL_INC_SALMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 4e8f6b1..302200a 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALOBJ_HXX
-#define _SV_SALOBJ_HXX
+#ifndef INCLUDED_VCL_INC_SALOBJ_HXX
+#define INCLUDED_VCL_INC_SALOBJ_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
@@ -77,6 +77,6 @@ public:
{ return m_bEraseBackground; }
};
-#endif // _SV_SALOBJ_HXX
+#endif // INCLUDED_VCL_INC_SALOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 4f1066c..b608439 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALPRN_HXX
-#define _SV_SALPRN_HXX
+#ifndef INCLUDED_VCL_INC_SALPRN_HXX
+#define INCLUDED_VCL_INC_SALPRN_HXX
#include <rtl/ustring.hxx>
@@ -114,6 +114,6 @@ public: // public for Sal Implementation
};
-#endif // _SV_SALPRN_HXX
+#endif // INCLUDED_VCL_INC_SALPRN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index 291872d..36fb3c2 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALPTYPE_HXX
-#define _SV_SALPTYPE_HXX
+#ifndef INCLUDED_VCL_INC_SALPTYPE_HXX
+#define INCLUDED_VCL_INC_SALPTYPE_HXX
#include <tools/solar.h>
@@ -49,6 +49,6 @@
class SalPrinter;
typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter );
-#endif // _SV_SALPTYPE_HXX
+#endif // INCLUDED_VCL_INC_SALPTYPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index 7806dba..37788b6 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_SALSESSION_HXX
-#define _VCL_SALSESSION_HXX
+#ifndef INCLUDED_VCL_INC_SALSESSION_HXX
+#define INCLUDED_VCL_INC_SALSESSION_HXX
#include "vcl/dllapi.h"
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 3d453b5..927cd62 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALSYS_HXX
-#define _SV_SALSYS_HXX
+#ifndef INCLUDED_VCL_INC_SALSYS_HXX
+#define INCLUDED_VCL_INC_SALSYS_HXX
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
@@ -124,6 +124,6 @@ public:
SalSystem* ImplGetSalSystem();
-#endif // _SV_SALSYS_HXX
+#endif // INCLUDED_VCL_INC_SALSYS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 5bca38b..3bdfbc3 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALTIMER_HXX
-#define _SV_SALTIMER_HXX
+#ifndef INCLUDED_VCL_INC_SALTIMER_HXX
+#define INCLUDED_VCL_INC_SALTIMER_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
@@ -54,6 +54,6 @@ public:
}
};
-#endif // _SV_SALTIMER_HXX
+#endif // INCLUDED_VCL_INC_SALTIMER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 2afebbe..74e4930 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALVD_HXX
-#define _SV_SALVD_HXX
+#ifndef INCLUDED_VCL_INC_SALVD_HXX
+#define INCLUDED_VCL_INC_SALVD_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
@@ -51,6 +51,6 @@ public: // public for Sal Implementation
virtual void GetSize( long& rWidth, long& rHeight ) = 0;
};
-#endif // _SV_SALVD_HXX
+#endif // INCLUDED_VCL_INC_SALVD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 544c7ad..135cd5d 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALWTYPE_HXX
-#define _SV_SALWTYPE_HXX
+#ifndef INCLUDED_VCL_INC_SALWTYPE_HXX
+#define INCLUDED_VCL_INC_SALWTYPE_HXX
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>
@@ -296,6 +296,6 @@ struct SalInputContext
typedef void (*SALTIMERPROC)();
-#endif // _SV_SALWTYPE_HXX
+#endif // INCLUDED_VCL_INC_SALWTYPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 3cef61b..112e739 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -49,8 +49,8 @@
*/
-#ifndef __SUBFONT_H
-#define __SUBFONT_H
+#ifndef INCLUDED_VCL_INC_SFT_HXX
+#define INCLUDED_VCL_INC_SFT_HXX
#ifdef UNX
#include <sys/types.h>
@@ -609,6 +609,6 @@ namespace vcl
} // namespace vcl
-#endif /* __SUBFONT_H */
+#endif // INCLUDED_VCL_INC_SFT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 3043ad7..8648eda 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SVDATA_HXX
-#define _SV_SVDATA_HXX
+#ifndef INCLUDED_VCL_INC_SVDATA_HXX
+#define INCLUDED_VCL_INC_SVDATA_HXX
#include "sal/types.h"
@@ -408,6 +408,6 @@ struct ImplSVEvent
sal_Bool mbCall;
};
-#endif // _SV_SVDATA_HXX
+#endif // INCLUDED_VCL_INC_SVDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 6bd76f6..997b3fb 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_SVSYS_H
-#define _VCL_SVSYS_H
+#ifndef INCLUDED_VCL_INC_SVSYS_H
+#define INCLUDED_VCL_INC_SVSYS_H
#ifdef WNT
#include "win/svsys.h"
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index dfc4008..541fcf4 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef VCL_TEXTLAYOUT_HXX
-#define VCL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX
+#define INCLUDED_VCL_INC_TEXTLAYOUT_HXX
#include <rtl/ustring.hxx>
#include <tools/solar.h>
@@ -126,6 +126,6 @@ namespace vcl
} // namespace vcl
//........................................................................
-#endif // VCL_TEXTLAYOUT_HXX
+#endif // INCLUDED_VCL_INC_TEXTLAYOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 1151823..029d3ec 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_TOOLBOX_H
-#define _SV_TOOLBOX_H
+#ifndef INCLUDED_VCL_INC_TOOLBOX_H
+#define INCLUDED_VCL_INC_TOOLBOX_H
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
@@ -181,6 +181,6 @@ struct ImplToolBoxPrivateData
};
-#endif // _SV_TOOLBOX_H
+#endif // INCLUDED_VCL_INC_TOOLBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index e41add4..f67e8ca 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_DESKTOPS_HXX
-#define INCLUDED_VCL_DESKTOPS_HXX
+#ifndef INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
+#define INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
enum DesktopType {
DESKTOP_NONE, // headless, i.e. no X connection at all
@@ -31,6 +31,6 @@ enum DesktopType {
DESKTOP_TDE
}; // keep in sync with desktop_strings[] in salplug.cxx
-#endif // INCLUDED_VCL_DESKTOPS_HXX
+#endif // INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 36b9b4a..480ce91 100644
--- a/vcl/inc/unx/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_BRIDGE_HXX__
-#define __ATK_BRIDGE_HXX__
+#ifndef INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX
#include <vclpluginapi.h>
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index fb05d43..ea005ae 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -8,8 +8,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef GLOACTIONGROUP_H
-#define GLOACTIONGROUP_H
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
+#define INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
#include <gio/gio.h>
@@ -77,6 +77,6 @@ void g_lo_action_group_clear (GLOActionGroup
G_END_DECLS
-#endif // GLOACTIONGROUP_H
+#endif // INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index f74af4b..197752f 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -8,8 +8,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __G_LO_MENU_H__
-#define __G_LO_MENU_H__
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
+#define INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
#include <gio/gio.h>
@@ -130,6 +130,6 @@ GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu
G_END_DECLS
-#endif /* __G_LO_MENU_H__ */
+#endif // INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 702c764..c125905 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKDATA_HXX
-#define _VCL_GTKDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
#include <prex.h>
#define GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -187,6 +187,6 @@ inline GdkDisplay *GtkData::GetGdkDisplay()
#if !GTK_CHECK_VERSION(3,0,0)
#endif
-#endif // _VCL_GTKDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4d4eaa6..0cf197a 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKFRAME_HXX
-#define _VCL_GTKFRAME_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
#include <prex.h>
#include <cairo.h>
@@ -459,6 +459,6 @@ GType ooo_fixed_get_type( void );
} // extern "C"
-#endif //_VCL_GTKFRAME_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d75e9dc..9ddd99b 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKGDI_HXX
-#define _VCL_GTKGDI_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
#include <prex.h>
#include <gtk/gtk.h>
@@ -280,6 +280,6 @@ protected:
#endif // !gtk3
-#endif // _VCL_GTKGDI_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 4787b21..9ec7c1e 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKINST_HXX
-#define _VCL_GTKINST_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
#include <boost/shared_ptr.hpp>
@@ -116,6 +116,6 @@ public:
mutable boost::shared_ptr<vcl::unx::GtkPrintWrapper> m_pPrintWrapper;
};
-#endif // _VCL_GTKINST_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 1690908..d19e45d 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKOBJECT_HXX
-#define _VCL_GTKOBJECT_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
#include <tools/solar.h>
#include <vcl/sysdata.hxx>
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 73ba680..2550dd3 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -8,8 +8,8 @@
*/
-#ifndef UNX_GTK_GTKPRN_HXX_INCLUDED
-#define UNX_GTK_GTKPRN_HXX_INCLUDED
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
#include "generic/genprn.h"
@@ -48,6 +48,6 @@ public:
};
-#endif // UNX_GTK_GTKPRN_HXX_INCLUDED
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 89c1af0..4b2ac33 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef GTKSALMENU_HXX
-#define GTKSALMENU_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#include <vector>
#ifdef ENABLE_GIO
@@ -120,6 +120,6 @@ public:
GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
};
-#endif // GTKSALMENU_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index d787476..46c6402 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_GTKSYS_HXX_
-#define _VCL_GTKSYS_HXX_
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
#include "generic/gensys.h"
#include <gtk/gtk.h>
@@ -46,6 +46,6 @@ public:
GdkScreen *getScreenMonitorFromIdx (int nIdx, gint &nMonitor);
};
-#endif // _VCL_GTKSYS_HXX_
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 74276ca..4d13799 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.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 _SAL_I18N_CALLBACK_HXX
-#define _SAL_I18N_CALLBACK_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_CB_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_CB_HXX
#include <salwtype.hxx>
#include <vector>
@@ -80,6 +80,6 @@ typedef struct {
std::vector< sal_uInt16 > aInputFlags;
} preedit_data_t;
-#endif /* _SAL_I18N_CALLBACK_HXX */
+#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a49368..6034517 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_INPUTCONTEXT_HXX
-#define _SAL_I18N_INPUTCONTEXT_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_IC_HXX
#include <i18nlangtag/lang.h>
#include "i18n_cb.hxx"
@@ -84,7 +84,7 @@ private:
};
-#endif // _SAL_I18N_INPUTCONTEXT_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 9a20fc5..0da25d6 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_INPUTMETHOD_HXX
-#define _SAL_I18N_INPUTMETHOD_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_IM_HXX
#include <vclpluginapi.h>
@@ -49,7 +49,7 @@ public:
~SalI18N_InputMethod();
};
-#endif // _SAL_I18N_INPUTMETHOD_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index bc200d0..8613867 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_KEYSYM_HXX
-#define _SAL_I18N_KEYSYM_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
/*
convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h
@@ -58,7 +58,7 @@
sal_Unicode KeysymToUnicode (KeySym nKeySym);
-#endif /* _SAL_I18N_KEYSYM_HXX */
+#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index f1769ed..bec53de 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_STATUS_HXX
-#define _SAL_I18N_STATUS_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
#include <rtl/ustring.hxx>
#include <salimestatus.hxx>
@@ -103,6 +103,6 @@ public:
} // namespace
-#endif // _SAL_I18N_STATUS_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index d22f02b..2c5f139 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_XKBDEXTENSION_HXX
-#define _SAL_I18N_XKBDEXTENSION_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
#include <sal/types.h>
#include <vclpluginapi.h>
@@ -89,6 +89,6 @@ SalI18N_KeyboardExtension::GetEventBase() const
return mnEventBase;
}
-#endif // _SAL_I18N_XKBDEXTENSION_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index b29a072..249dde6 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_KDEDATA_HXX
-#define _VCL_KDEDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX
+#define INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX
#include <unx/saldisp.hxx>
#include <unx/saldata.hxx>
@@ -105,6 +105,6 @@ public:
void doStartup();
};
-#endif // _VCL_KDEDATA_HXX
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list