summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svx/grfcrop.hxx5
-rw-r--r--sw/inc/AnnotationWin.hxx4
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx4
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx4
-rw-r--r--sw/inc/IDocumentChartDataProviderAccess.hxx6
-rw-r--r--sw/inc/IDocumentContentOperations.hxx6
-rw-r--r--sw/inc/IDocumentDeviceAccess.hxx6
-rw-r--r--sw/inc/IDocumentDrawModelAccess.hxx4
-rw-r--r--sw/inc/IDocumentExternalData.hxx6
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx6
-rw-r--r--sw/inc/IDocumentLineNumberAccess.hxx6
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx6
-rw-r--r--sw/inc/IDocumentListItems.hxx6
-rw-r--r--sw/inc/IDocumentListsAccess.hxx6
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx4
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx6
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx4
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx6
-rw-r--r--sw/inc/IDocumentState.hxx6
-rw-r--r--sw/inc/IDocumentStatistics.hxx6
-rw-r--r--sw/inc/IDocumentStylePoolAccess.hxx6
-rw-r--r--sw/inc/IDocumentTimerAccess.hxx6
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx4
-rw-r--r--sw/inc/IGrammarContact.hxx6
-rw-r--r--sw/inc/IInterface.hxx4
-rw-r--r--sw/inc/IMark.hxx4
-rw-r--r--sw/inc/IShellCursorSupplier.hxx6
-rw-r--r--sw/inc/PostItMgr.hxx4
-rw-r--r--sw/inc/SidebarWin.hxx4
-rw-r--r--sw/inc/SidebarWindowsTypes.hxx4
-rw-r--r--sw/inc/SwAppletImpl.hxx4
-rw-r--r--sw/inc/SwCapObjType.hxx4
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx4
-rw-r--r--sw/inc/SwNodeNum.hxx6
-rw-r--r--sw/inc/SwNumberTree.hxx6
-rw-r--r--sw/inc/SwNumberTreeTypes.hxx6
-rw-r--r--sw/inc/SwPanelFactory.hxx4
-rw-r--r--sw/inc/SwRewriter.hxx6
-rw-r--r--sw/inc/SwSmartTagMgr.hxx4
-rw-r--r--sw/inc/SwStyleNameMapper.hxx4
-rw-r--r--sw/inc/SwUndoField.hxx6
-rw-r--r--sw/inc/SwXMLSectionList.hxx4
-rw-r--r--sw/inc/TextCursorHelper.hxx6
-rw-r--r--sw/inc/accessibilityoptions.hxx4
-rw-r--r--sw/inc/accmap.hxx4
-rw-r--r--sw/inc/acmplwrd.hxx4
-rw-r--r--sw/inc/anchoreddrawobject.hxx4
-rw-r--r--sw/inc/anchoredobject.hxx4
-rw-r--r--sw/inc/authfld.hxx4
-rw-r--r--sw/inc/authratr.hxx4
-rw-r--r--sw/inc/bparr.hxx4
-rw-r--r--sw/inc/breakit.hxx4
-rw-r--r--sw/inc/calbck.hxx4
-rw-r--r--sw/inc/calc.hxx4
-rw-r--r--sw/inc/ccoll.hxx4
-rw-r--r--sw/inc/cellatr.hxx4
-rw-r--r--sw/inc/cellfml.hxx4
-rw-r--r--sw/inc/charatr.hxx4
-rw-r--r--sw/inc/charfmt.hxx4
-rw-r--r--sw/inc/chcmprse.hxx4
-rw-r--r--sw/inc/checkit.hxx4
-rw-r--r--sw/inc/chpfld.hxx6
-rw-r--r--sw/inc/cmdid.h6
-rw-r--r--sw/inc/colwd.hxx4
-rw-r--r--sw/inc/crsrsh.hxx4
-rw-r--r--sw/inc/crsskip.hxx4
-rw-r--r--sw/inc/crstate.hxx4
-rw-r--r--sw/inc/cshtyp.hxx6
-rw-r--r--sw/inc/dbfld.hxx6
-rw-r--r--sw/inc/dbgoutsw.hxx6
-rw-r--r--sw/inc/dbmgr.hxx4
-rw-r--r--sw/inc/dcontact.hxx4
-rw-r--r--sw/inc/ddefld.hxx6
-rw-r--r--sw/inc/dlelstnr.hxx4
-rw-r--r--sw/inc/dobjfac.hxx6
-rw-r--r--sw/inc/doc.hxx4
-rw-r--r--sw/inc/docary.hxx6
-rw-r--r--sw/inc/docfac.hxx4
-rw-r--r--sw/inc/docsh.hxx4
-rw-r--r--sw/inc/docstat.hxx4
-rw-r--r--sw/inc/docstyle.hxx4
-rw-r--r--sw/inc/docufld.hxx6
-rw-r--r--sw/inc/dpage.hxx6
-rw-r--r--sw/inc/edglbldc.hxx4
-rw-r--r--sw/inc/edimp.hxx4
-rw-r--r--sw/inc/editsh.hxx4
-rw-r--r--sw/inc/expfld.hxx6
-rw-r--r--sw/inc/extinput.hxx6
-rw-r--r--sw/inc/fchrfmt.hxx4
-rw-r--r--sw/inc/fesh.hxx4
-rw-r--r--sw/inc/fldbas.hxx6
-rw-r--r--sw/inc/flddat.hxx6
-rw-r--r--sw/inc/flddropdown.hxx4
-rw-r--r--sw/inc/fldupde.hxx4
-rw-r--r--sw/inc/flyenum.hxx4
-rw-r--r--sw/inc/flypos.hxx6
-rw-r--r--sw/inc/fmtanchr.hxx4
-rw-r--r--sw/inc/fmtautofmt.hxx4
-rw-r--r--sw/inc/fmtclbl.hxx4
-rw-r--r--sw/inc/fmtclds.hxx4
-rw-r--r--sw/inc/fmtcnct.hxx4
-rw-r--r--sw/inc/fmtcntnt.hxx4
-rw-r--r--sw/inc/fmtcol.hxx4
-rw-r--r--sw/inc/fmtcolfunc.hxx4
-rw-r--r--sw/inc/fmteiro.hxx4
-rw-r--r--sw/inc/fmtflcnt.hxx4
-rw-r--r--sw/inc/fmtfld.hxx4
-rw-r--r--sw/inc/fmtfollowtextflow.hxx4
-rw-r--r--sw/inc/fmtfordr.hxx4
-rw-r--r--sw/inc/fmtfsize.hxx4
-rw-r--r--sw/inc/fmtftn.hxx4
-rw-r--r--sw/inc/fmtftntx.hxx4
-rw-r--r--sw/inc/fmthdft.hxx4
-rw-r--r--sw/inc/fmtinfmt.hxx4
-rw-r--r--sw/inc/fmtline.hxx4
-rw-r--r--sw/inc/fmtlsplt.hxx4
-rw-r--r--sw/inc/fmtmeta.hxx6
-rw-r--r--sw/inc/fmtornt.hxx4
-rw-r--r--sw/inc/fmtpdsc.hxx4
-rw-r--r--sw/inc/fmtrfmrk.hxx4
-rw-r--r--sw/inc/fmtrowsplt.hxx4
-rw-r--r--sw/inc/fmtruby.hxx4
-rw-r--r--sw/inc/fmtsrnd.hxx4
-rw-r--r--sw/inc/fmtsrndenum.hxx4
-rw-r--r--sw/inc/fmturl.hxx4
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx4
-rw-r--r--sw/inc/format.hxx6
-rw-r--r--sw/inc/frmatr.hxx6
-rw-r--r--sw/inc/frmfmt.hxx4
-rw-r--r--sw/inc/ftnidx.hxx6
-rw-r--r--sw/inc/ftninfo.hxx4
-rw-r--r--sw/inc/globdoc.hxx4
-rw-r--r--sw/inc/grfatr.hxx6
-rw-r--r--sw/inc/hfspacingitem.hxx4
-rw-r--r--sw/inc/hhcwrp.hxx4
-rw-r--r--sw/inc/hintids.hxx4
-rw-r--r--sw/inc/hints.hxx4
-rw-r--r--sw/inc/htmltbl.hxx4
-rw-r--r--sw/inc/index.hxx4
-rw-r--r--sw/inc/init.hxx4
-rw-r--r--sw/inc/iodetect.hxx4
-rw-r--r--sw/inc/istyleaccess.hxx6
-rw-r--r--sw/inc/itabenum.hxx4
-rw-r--r--sw/inc/lineinfo.hxx4
-rw-r--r--sw/inc/linkenum.hxx4
-rw-r--r--sw/inc/list.hxx6
-rw-r--r--sw/inc/listfunc.hxx6
-rw-r--r--sw/inc/mdiexp.hxx4
-rw-r--r--sw/inc/modcfg.hxx4
-rw-r--r--sw/inc/modeltoviewhelper.hxx4
-rw-r--r--sw/inc/ndarr.hxx4
-rw-r--r--sw/inc/ndgrf.hxx4
-rw-r--r--sw/inc/ndhints.hxx4
-rw-r--r--sw/inc/ndindex.hxx4
-rw-r--r--sw/inc/ndnotxt.hxx6
-rw-r--r--sw/inc/ndole.hxx6
-rw-r--r--sw/inc/ndtxt.hxx4
-rw-r--r--sw/inc/ndtyp.hxx4
-rw-r--r--sw/inc/node.hxx4
-rw-r--r--sw/inc/numrule.hxx6
-rw-r--r--sw/inc/pagedesc.hxx6
-rw-r--r--sw/inc/pagepreviewlayout.hxx6
-rw-r--r--sw/inc/pam.hxx6
-rw-r--r--sw/inc/paratr.hxx4
-rw-r--r--sw/inc/pausethreadstarting.hxx4
-rw-r--r--sw/inc/poolfmt.hxx4
-rw-r--r--sw/inc/postithelper.hxx6
-rw-r--r--sw/inc/printdata.hxx6
-rw-r--r--sw/inc/prtopt.hxx4
-rw-r--r--sw/inc/pvprtdat.hxx4
-rw-r--r--sw/inc/redline.hxx4
-rw-r--r--sw/inc/reffld.hxx6
-rw-r--r--sw/inc/ring.hxx4
-rw-r--r--sw/inc/rubylist.hxx6
-rw-r--r--sw/inc/section.hxx6
-rw-r--r--sw/inc/shellid.hxx4
-rw-r--r--sw/inc/shellio.hxx4
-rw-r--r--sw/inc/shellres.hxx6
-rw-r--r--sw/inc/sortopt.hxx6
-rw-r--r--sw/inc/splargs.hxx4
-rw-r--r--sw/inc/sw_primitivetypes2d.hxx6
-rw-r--r--sw/inc/swabstdlg.hxx4
-rw-r--r--sw/inc/swacorr.hxx4
-rw-r--r--sw/inc/swatrset.hxx4
-rw-r--r--sw/inc/swbaslnk.hxx4
-rw-r--r--sw/inc/swcalwrp.hxx4
-rw-r--r--sw/inc/swcli.hxx4
-rw-r--r--sw/inc/swcommands.h4
-rw-r--r--sw/inc/swcrsr.hxx4
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swdbtoolsclient.hxx4
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swddllapi.h6
-rw-r--r--sw/inc/swdll.hxx4
-rw-r--r--sw/inc/swdllapi.h6
-rw-r--r--sw/inc/swerror.h4
-rw-r--r--sw/inc/swevent.hxx4
-rw-r--r--sw/inc/swfltopt.hxx4
-rw-r--r--sw/inc/swhints.hxx4
-rw-r--r--sw/inc/switerator.hxx4
-rw-r--r--sw/inc/swmodule.hxx4
-rw-r--r--sw/inc/swrect.hxx6
-rw-r--r--sw/inc/swregion.hxx6
-rw-r--r--sw/inc/swscanner.hxx4
-rw-r--r--sw/inc/swserv.hxx6
-rw-r--r--sw/inc/swstyle.h4
-rw-r--r--sw/inc/swtable.hxx6
-rw-r--r--sw/inc/swtblfmt.hxx4
-rw-r--r--sw/inc/swtypes.hxx4
-rw-r--r--sw/inc/swundo.hxx4
-rw-r--r--sw/inc/swunohelper.hxx4
-rw-r--r--sw/inc/swurl.hxx4
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx6
-rw-r--r--sw/inc/tblafmt.hxx4
-rw-r--r--sw/inc/tblenum.hxx4
-rw-r--r--sw/inc/tblsel.hxx6
-rw-r--r--sw/inc/tgrditem.hxx4
-rw-r--r--sw/inc/tox.hxx6
-rw-r--r--sw/inc/toxe.hxx4
-rw-r--r--sw/inc/toxwrap.hxx4
-rw-r--r--sw/inc/txatbase.hxx4
-rw-r--r--sw/inc/txatritr.hxx4
-rw-r--r--sw/inc/txtatr.hxx4
-rw-r--r--sw/inc/txtflcnt.hxx4
-rw-r--r--sw/inc/txtfld.hxx4
-rw-r--r--sw/inc/txtftn.hxx4
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/txtrfmrk.hxx4
-rw-r--r--sw/inc/txttxmrk.hxx4
-rw-r--r--sw/inc/undobj.hxx4
-rw-r--r--sw/inc/unobaseclass.hxx6
-rw-r--r--sw/inc/unochart.hxx4
-rw-r--r--sw/inc/unocoll.hxx4
-rw-r--r--sw/inc/unocrsr.hxx4
-rw-r--r--sw/inc/unocrsrhelper.hxx4
-rw-r--r--sw/inc/unodraw.hxx4
-rw-r--r--sw/inc/unofieldcoll.hxx4
-rw-r--r--sw/inc/unoframe.hxx4
-rw-r--r--sw/inc/unoidxcoll.hxx4
-rw-r--r--sw/inc/unomap.hxx4
-rw-r--r--sw/inc/unomid.h4
-rw-r--r--sw/inc/unoparagraph.hxx6
-rw-r--r--sw/inc/unoprnms.hxx4
-rw-r--r--sw/inc/unoredline.hxx4
-rw-r--r--sw/inc/unoredlines.hxx4
-rw-r--r--sw/inc/unosett.hxx4
-rw-r--r--sw/inc/unosrch.hxx4
-rw-r--r--sw/inc/unostyle.hxx4
-rw-r--r--sw/inc/unotbl.hxx4
-rw-r--r--sw/inc/unotext.hxx6
-rw-r--r--sw/inc/unotextbodyhf.hxx6
-rw-r--r--sw/inc/unotextcursor.hxx6
-rw-r--r--sw/inc/unotextrange.hxx6
-rw-r--r--sw/inc/unotxdoc.hxx4
-rw-r--r--sw/inc/usrfld.hxx6
-rw-r--r--sw/inc/viewopt.hxx4
-rw-r--r--sw/inc/viewsh.hxx6
-rw-r--r--sw/inc/viscrs.hxx6
-rw-r--r--sw/inc/wdocsh.hxx4
-rw-r--r--sw/source/core/access/acccell.hxx4
-rw-r--r--sw/source/core/access/acccontext.hxx4
-rw-r--r--sw/source/core/access/accdoc.hxx4
-rw-r--r--sw/source/core/access/accembedded.hxx4
-rw-r--r--sw/source/core/access/accfootnote.hxx4
-rw-r--r--sw/source/core/access/accframe.hxx4
-rw-r--r--sw/source/core/access/accframebase.hxx4
-rw-r--r--sw/source/core/access/accfrmobj.hxx4
-rw-r--r--sw/source/core/access/accfrmobjmap.hxx4
-rw-r--r--sw/source/core/access/accfrmobjslist.hxx4
-rw-r--r--sw/source/core/access/accgraphic.hxx4
-rw-r--r--sw/source/core/access/accheaderfooter.hxx4
-rw-r--r--sw/source/core/access/acchyperlink.hxx4
-rw-r--r--sw/source/core/access/acchypertextdata.hxx4
-rw-r--r--sw/source/core/access/accnotextframe.hxx4
-rw-r--r--sw/source/core/access/accpage.hxx4
-rw-r--r--sw/source/core/access/accpara.hxx4
-rw-r--r--sw/source/core/access/accportions.hxx4
-rw-r--r--sw/source/core/access/accpreview.hxx4
-rw-r--r--sw/source/core/access/accselectionhelper.hxx4
-rw-r--r--sw/source/core/access/acctable.hxx4
-rw-r--r--sw/source/core/access/acctextframe.hxx4
-rw-r--r--sw/source/core/access/parachangetrackinginfo.hxx4
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx4
-rw-r--r--sw/source/core/crsr/BlockCursor.hxx4
-rw-r--r--sw/source/core/crsr/IBlockCursor.hxx4
-rw-r--r--sw/source/core/crsr/callnk.hxx6
-rw-r--r--sw/source/core/doc/swstylemanager.hxx6
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx4
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx4
-rw-r--r--sw/source/core/inc/MarkManager.hxx4
-rw-r--r--sw/source/core/inc/SwGrammarMarkUp.hxx4
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx4
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx6
-rw-r--r--sw/source/core/inc/SwUndoPageDesc.hxx4
-rw-r--r--sw/source/core/inc/SwUndoTOXChange.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx4
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx4
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx4
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx6
-rw-r--r--sw/source/core/inc/UndoBookmark.hxx6
-rw-r--r--sw/source/core/inc/UndoCore.hxx6
-rw-r--r--sw/source/core/inc/UndoDelete.hxx6
-rw-r--r--sw/source/core/inc/UndoDraw.hxx6
-rw-r--r--sw/source/core/inc/UndoInsert.hxx6
-rw-r--r--sw/source/core/inc/UndoManager.hxx6
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx6
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx6
-rw-r--r--sw/source/core/inc/UndoRedline.hxx6
-rw-r--r--sw/source/core/inc/UndoSection.hxx6
-rw-r--r--sw/source/core/inc/UndoSort.hxx6
-rw-r--r--sw/source/core/inc/UndoSplitMove.hxx6
-rw-r--r--sw/source/core/inc/UndoTable.hxx6
-rw-r--r--sw/source/core/inc/acorrect.hxx4
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx4
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx4
-rw-r--r--sw/source/core/inc/attrhint.hxx4
-rw-r--r--sw/source/core/inc/blink.hxx4
-rw-r--r--sw/source/core/inc/bodyfrm.hxx4
-rw-r--r--sw/source/core/inc/bookmrk.hxx4
-rw-r--r--sw/source/core/inc/cellfrm.hxx4
-rw-r--r--sw/source/core/inc/cntfrm.hxx4
-rw-r--r--sw/source/core/inc/colfrm.hxx6
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx4
-rw-r--r--sw/source/core/inc/dbg_lay.hxx4
-rw-r--r--sw/source/core/inc/dflyobj.hxx4
-rw-r--r--sw/source/core/inc/docfld.hxx4
-rw-r--r--sw/source/core/inc/docsort.hxx4
-rw-r--r--sw/source/core/inc/doctxm.hxx4
-rw-r--r--sw/source/core/inc/drawfont.hxx4
-rw-r--r--sw/source/core/inc/dumpfilter.hxx4
-rw-r--r--sw/source/core/inc/dview.hxx4
-rw-r--r--sw/source/core/inc/environmentofanchoredobject.hxx4
-rw-r--r--sw/source/core/inc/fieldhint.hxx4
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx4
-rw-r--r--sw/source/core/inc/flowfrm.hxx4
-rw-r--r--sw/source/core/inc/flyfrm.hxx4
-rw-r--r--sw/source/core/inc/flyfrms.hxx4
-rw-r--r--sw/source/core/inc/fntcache.hxx4
-rw-r--r--sw/source/core/inc/frame.hxx4
-rw-r--r--sw/source/core/inc/frminf.hxx4
-rw-r--r--sw/source/core/inc/frmtool.hxx4
-rw-r--r--sw/source/core/inc/ftnboss.hxx4
-rw-r--r--sw/source/core/inc/ftnfrm.hxx4
-rw-r--r--sw/source/core/inc/hffrm.hxx4
-rw-r--r--sw/source/core/inc/ifinishedthreadlistener.hxx4
-rw-r--r--sw/source/core/inc/ithreadlistenerowner.hxx4
-rw-r--r--sw/source/core/inc/layact.hxx6
-rw-r--r--sw/source/core/inc/laycache.hxx4
-rw-r--r--sw/source/core/inc/layfrm.hxx6
-rw-r--r--sw/source/core/inc/layouter.hxx6
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx4
-rw-r--r--sw/source/core/inc/mvsave.hxx6
-rw-r--r--sw/source/core/inc/node2lay.hxx4
-rw-r--r--sw/source/core/inc/noteurl.hxx4
-rw-r--r--sw/source/core/inc/notxtfrm.hxx4
-rw-r--r--sw/source/core/inc/objectformatter.hxx4
-rw-r--r--sw/source/core/inc/observablethread.hxx4
-rw-r--r--sw/source/core/inc/pagedeschint.hxx4
-rw-r--r--sw/source/core/inc/pagefrm.hxx6
-rw-r--r--sw/source/core/inc/pamtyp.hxx4
-rw-r--r--sw/source/core/inc/prevwpage.hxx4
-rw-r--r--sw/source/core/inc/ptqueue.hxx4
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx4
-rw-r--r--sw/source/core/inc/retrieveinputstream.hxx4
-rw-r--r--sw/source/core/inc/retrieveinputstreamconsumer.hxx4
-rw-r--r--sw/source/core/inc/rolbck.hxx6
-rw-r--r--sw/source/core/inc/rootfrm.hxx6
-rw-r--r--sw/source/core/inc/rowfrm.hxx4
-rw-r--r--sw/source/core/inc/scriptinfo.hxx4
-rw-r--r--sw/source/core/inc/sectfrm.hxx6
-rw-r--r--sw/source/core/inc/setmapvirtdev.hxx4
-rw-r--r--sw/source/core/inc/sortedobjs.hxx4
-rw-r--r--sw/source/core/inc/swblocks.hxx4
-rw-r--r--sw/source/core/inc/swcache.hxx4
-rw-r--r--sw/source/core/inc/swfntcch.hxx4
-rw-r--r--sw/source/core/inc/swfont.hxx4
-rw-r--r--sw/source/core/inc/swselectionlist.hxx6
-rw-r--r--sw/source/core/inc/swthreadjoiner.hxx4
-rw-r--r--sw/source/core/inc/swthreadmanager.hxx4
-rw-r--r--sw/source/core/inc/tabfrm.hxx6
-rw-r--r--sw/source/core/inc/tblrwcl.hxx4
-rw-r--r--sw/source/core/inc/textapi.hxx4
-rw-r--r--sw/source/core/inc/threadlistener.hxx4
-rw-r--r--sw/source/core/inc/threadmanager.hxx4
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx4
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx4
-rw-r--r--sw/source/core/inc/txmsrt.hxx6
-rw-r--r--sw/source/core/inc/txtfrm.hxx4
-rw-r--r--sw/source/core/inc/txttypes.hxx6
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx6
-rw-r--r--sw/source/core/inc/unobookmark.hxx6
-rw-r--r--sw/source/core/inc/unoevent.hxx4
-rw-r--r--sw/source/core/inc/unofield.hxx4
-rw-r--r--sw/source/core/inc/unoflatpara.hxx4
-rw-r--r--sw/source/core/inc/unofldmid.h4
-rw-r--r--sw/source/core/inc/unofootnote.hxx6
-rw-r--r--sw/source/core/inc/unoidx.hxx4
-rw-r--r--sw/source/core/inc/unometa.hxx6
-rw-r--r--sw/source/core/inc/unoparaframeenum.hxx6
-rw-r--r--sw/source/core/inc/unoport.hxx4
-rw-r--r--sw/source/core/inc/unorefmark.hxx6
-rw-r--r--sw/source/core/inc/unosection.hxx6
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx4
-rw-r--r--sw/source/core/inc/viewimp.hxx6
-rw-r--r--sw/source/core/inc/visiturl.hxx4
-rw-r--r--sw/source/core/inc/wrong.hxx4
-rw-r--r--sw/source/core/layout/layhelp.hxx4
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx4
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx4
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.hxx4
-rw-r--r--sw/source/core/layout/virtoutp.hxx4
-rw-r--r--sw/source/core/text/atrhndl.hxx4
-rw-r--r--sw/source/core/text/guess.hxx4
-rw-r--r--sw/source/core/text/inftxt.hxx4
-rw-r--r--sw/source/core/text/itratr.hxx4
-rw-r--r--sw/source/core/text/itrform2.hxx4
-rw-r--r--sw/source/core/text/itrpaint.hxx4
-rw-r--r--sw/source/core/text/itrtxt.hxx4
-rw-r--r--sw/source/core/text/pordrop.hxx4
-rw-r--r--sw/source/core/text/porexp.hxx4
-rw-r--r--sw/source/core/text/porfld.hxx4
-rw-r--r--sw/source/core/text/porfly.hxx4
-rw-r--r--sw/source/core/text/porftn.hxx4
-rw-r--r--sw/source/core/text/porglue.hxx4
-rw-r--r--sw/source/core/text/porhyph.hxx4
-rw-r--r--sw/source/core/text/porlay.hxx4
-rw-r--r--sw/source/core/text/porlin.hxx4
-rw-r--r--sw/source/core/text/pormulti.hxx4
-rw-r--r--sw/source/core/text/porref.hxx4
-rw-r--r--sw/source/core/text/porrst.hxx4
-rw-r--r--sw/source/core/text/portab.hxx4
-rw-r--r--sw/source/core/text/portox.hxx4
-rw-r--r--sw/source/core/text/portxt.hxx4
-rw-r--r--sw/source/core/text/possiz.hxx4
-rw-r--r--sw/source/core/text/redlnitr.hxx4
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/txtfly.hxx4
-rw-r--r--sw/source/core/text/txtpaint.hxx4
-rw-r--r--sw/source/core/text/widorp.hxx4
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx6
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx6
-rw-r--r--sw/source/filter/html/css1kywd.hxx4
-rw-r--r--sw/source/filter/html/htmlfld.hxx4
-rw-r--r--sw/source/filter/html/htmlfly.hxx4
-rw-r--r--sw/source/filter/html/htmlform.hxx4
-rw-r--r--sw/source/filter/html/htmlnum.hxx4
-rw-r--r--sw/source/filter/html/htmlvsh.hxx4
-rw-r--r--sw/source/filter/html/parcss1.hxx4
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swcss1.hxx4
-rw-r--r--sw/source/filter/html/swhtml.hxx4
-rw-r--r--sw/source/filter/html/wrthtml.hxx6
-rw-r--r--sw/source/filter/inc/fltini.hxx4
-rw-r--r--sw/source/filter/inc/fltshell.hxx4
-rw-r--r--sw/source/filter/inc/msfilter.hxx4
-rw-r--r--sw/source/filter/inc/rtf.hxx6
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx6
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx4
-rw-r--r--sw/source/filter/inc/wwstyles.hxx4
-rw-r--r--sw/source/filter/ww1/w1par.hxx4
-rw-r--r--sw/source/filter/ww1/w1struct.hxx4
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx6
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx6
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx6
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx6
-rw-r--r--sw/source/filter/ww8/docxexport.hxx6
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx6
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx6
-rw-r--r--sw/source/filter/ww8/docxhelper.hxx6
-rw-r--r--sw/source/filter/ww8/docxtablestyleexport.hxx6
-rw-r--r--sw/source/filter/ww8/escher.hxx4
-rw-r--r--sw/source/filter/ww8/fields.hxx4
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx4
-rw-r--r--sw/source/filter/ww8/needed_cast.hxx4
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx6
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx6
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.hxx6
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx4
-rw-r--r--sw/source/filter/ww8/staticassert.hxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx6
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx6
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx4
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx4
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx4
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrshe.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx6
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx6
-rw-r--r--sw/source/filter/xml/xmlimp.hxx4
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx6
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx4
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx6
-rw-r--r--sw/source/filter/xml/xmltbli.hxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx6
-rw-r--r--sw/source/filter/xml/xmltexti.hxx6
-rw-r--r--sw/source/ui/app/swdllimpl.hxx4
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx4
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx4
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx4
-rw-r--r--sw/source/ui/docvw/AnchorOverlayObject.hxx4
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.hxx4
-rw-r--r--sw/source/ui/docvw/ShadowOverlayObject.hxx4
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx4
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.hxx4
-rw-r--r--sw/source/ui/docvw/SidebarWinAcc.hxx4
-rw-r--r--sw/source/ui/docvw/frmsidebarwincontainer.hxx4
-rw-r--r--sw/source/ui/docvw/romenu.hxx4
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envprt.hxx4
-rw-r--r--sw/source/ui/envelp/labfmt.hxx4
-rw-r--r--sw/source/ui/envelp/labimp.hxx4
-rw-r--r--sw/source/ui/envelp/labprt.hxx4
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx4
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx4
-rw-r--r--sw/source/ui/fldui/flddb.hxx4
-rw-r--r--sw/source/ui/fldui/flddinf.hxx4
-rw-r--r--sw/source/ui/fldui/flddok.hxx4
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx4
-rw-r--r--sw/source/ui/fldui/fldpage.hxx4
-rw-r--r--sw/source/ui/fldui/fldref.hxx4
-rw-r--r--sw/source/ui/fldui/fldvar.hxx4
-rw-r--r--sw/source/ui/inc/DashedLine.hxx4
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx4
-rw-r--r--sw/source/ui/inc/FrameControl.hxx4
-rw-r--r--sw/source/ui/inc/FrameControlsManager.hxx4
-rw-r--r--sw/source/ui/inc/HeaderFooterWin.hxx4
-rw-r--r--sw/source/ui/inc/PageBreakWin.hxx4
-rw-r--r--sw/source/ui/inc/SidebarWindowsConsts.hxx4
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx4
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx4
-rw-r--r--sw/source/ui/inc/abstract.hxx4
-rw-r--r--sw/source/ui/inc/actctrl.hxx4
-rw-r--r--sw/source/ui/inc/addrdlg.hxx4
-rw-r--r--sw/source/ui/inc/annotsh.hxx4
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx4
-rw-r--r--sw/source/ui/inc/autoedit.hxx4
-rw-r--r--sw/source/ui/inc/barcfg.hxx4
-rw-r--r--sw/source/ui/inc/basesh.hxx4
-rw-r--r--sw/source/ui/inc/beziersh.hxx4
-rw-r--r--sw/source/ui/inc/bmpwin.hxx4
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx4
-rw-r--r--sw/source/ui/inc/break.hxx4
-rw-r--r--sw/source/ui/inc/caption.hxx4
-rw-r--r--sw/source/ui/inc/cfgid.h4
-rw-r--r--sw/source/ui/inc/cfgitems.hxx4
-rw-r--r--sw/source/ui/inc/changedb.hxx4
-rw-r--r--sw/source/ui/inc/chartins.hxx6
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx4
-rw-r--r--sw/source/ui/inc/chrdlgmodes.hxx6
-rw-r--r--sw/source/ui/inc/cnttab.hxx4
-rw-r--r--sw/source/ui/inc/colex.hxx6
-rw-r--r--sw/source/ui/inc/colmgr.hxx4
-rw-r--r--sw/source/ui/inc/column.hxx4
-rw-r--r--sw/source/ui/inc/conarc.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx4
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx6
-rw-r--r--sw/source/ui/inc/conrect.hxx6
-rw-r--r--sw/source/ui/inc/conttree.hxx4
-rw-r--r--sw/source/ui/inc/convert.hxx4
-rw-r--r--sw/source/ui/inc/cption.hxx4
-rw-r--r--sw/source/ui/inc/dbconfig.hxx4
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/ui/inc/dbtree.hxx4
-rw-r--r--sw/source/ui/inc/dbui.hxx4
-rw-r--r--sw/source/ui/inc/dialmgr.hxx4
-rw-r--r--sw/source/ui/inc/docfnote.hxx4
-rw-r--r--sw/source/ui/inc/docstdlg.hxx4
-rw-r--r--sw/source/ui/inc/drawbase.hxx6
-rw-r--r--sw/source/ui/inc/drawsh.hxx4
-rw-r--r--sw/source/ui/inc/drformsh.hxx4
-rw-r--r--sw/source/ui/inc/drpcps.hxx4
-rw-r--r--sw/source/ui/inc/drwbassh.hxx4
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx4
-rw-r--r--sw/source/ui/inc/dselect.hxx6
-rw-r--r--sw/source/ui/inc/edtwin.hxx4
-rw-r--r--sw/source/ui/inc/envimg.hxx4
-rw-r--r--sw/source/ui/inc/envlop.hxx4
-rw-r--r--sw/source/ui/inc/fldedt.hxx4
-rw-r--r--sw/source/ui/inc/fldmgr.hxx4
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx4
-rw-r--r--sw/source/ui/inc/fldwrap.hxx4
-rw-r--r--sw/source/ui/inc/fontcfg.hxx4
-rw-r--r--sw/source/ui/inc/formatclipboard.hxx4
-rw-r--r--sw/source/ui/inc/formedt.hxx4
-rw-r--r--sw/source/ui/inc/frmdlg.hxx6
-rw-r--r--sw/source/ui/inc/frmmgr.hxx4
-rw-r--r--sw/source/ui/inc/frmpage.hxx6
-rw-r--r--sw/source/ui/inc/frmsh.hxx4
-rw-r--r--sw/source/ui/inc/globals.h4
-rw-r--r--sw/source/ui/inc/glosbib.hxx4
-rw-r--r--sw/source/ui/inc/glosdoc.hxx6
-rw-r--r--sw/source/ui/inc/gloshdl.hxx6
-rw-r--r--sw/source/ui/inc/gloslst.hxx4
-rw-r--r--sw/source/ui/inc/glossary.hxx4
-rw-r--r--sw/source/ui/inc/glshell.hxx4
-rw-r--r--sw/source/ui/inc/grfsh.hxx4
-rw-r--r--sw/source/ui/inc/hyp.hxx4
-rw-r--r--sw/source/ui/inc/idxmrk.hxx6
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx4
-rw-r--r--sw/source/ui/inc/initui.hxx4
-rw-r--r--sw/source/ui/inc/inpdlg.hxx4
-rw-r--r--sw/source/ui/inc/inputwin.hxx4
-rw-r--r--sw/source/ui/inc/insfnote.hxx4
-rw-r--r--sw/source/ui/inc/instable.hxx4
-rw-r--r--sw/source/ui/inc/javaedit.hxx4
-rw-r--r--sw/source/ui/inc/label.hxx4
-rw-r--r--sw/source/ui/inc/labelcfg.hxx4
-rw-r--r--sw/source/ui/inc/labimg.hxx4
-rw-r--r--sw/source/ui/inc/langhelper.hxx4
-rw-r--r--sw/source/ui/inc/linenum.hxx4
-rw-r--r--sw/source/ui/inc/listsh.hxx4
-rw-r--r--sw/source/ui/inc/macassgn.hxx4
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx4
-rw-r--r--sw/source/ui/inc/maildispatcher.hxx6
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx4
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx4
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx4
-rw-r--r--sw/source/ui/inc/mailmrge.hxx4
-rw-r--r--sw/source/ui/inc/mediash.hxx4
-rw-r--r--sw/source/ui/inc/mergetbl.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx4
-rw-r--r--sw/source/ui/inc/multmrk.hxx6
-rw-r--r--sw/source/ui/inc/navicfg.hxx4
-rw-r--r--sw/source/ui/inc/navicont.hxx4
-rw-r--r--sw/source/ui/inc/navipi.hxx4
-rw-r--r--sw/source/ui/inc/navmgr.hxx4
-rw-r--r--sw/source/ui/inc/navsh.hxx4
-rw-r--r--sw/source/ui/inc/num.hxx6
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx4
-rw-r--r--sw/source/ui/inc/numpara.hxx4
-rw-r--r--sw/source/ui/inc/numprevw.hxx4
-rw-r--r--sw/source/ui/inc/olesh.hxx4
-rw-r--r--sw/source/ui/inc/olmenu.hxx4
-rw-r--r--sw/source/ui/inc/optcomp.hxx4
-rw-r--r--sw/source/ui/inc/optpage.hxx4
-rw-r--r--sw/source/ui/inc/outline.hxx4
-rw-r--r--sw/source/ui/inc/pardlg.hxx4
-rw-r--r--sw/source/ui/inc/pattern.hxx4
-rw-r--r--sw/source/ui/inc/pgfnote.hxx4
-rw-r--r--sw/source/ui/inc/pggrid.hxx4
-rw-r--r--sw/source/ui/inc/popbox.hxx4
-rw-r--r--sw/source/ui/inc/prcntfld.hxx6
-rw-r--r--sw/source/ui/inc/pview.hxx4
-rw-r--r--sw/source/ui/inc/redlndlg.hxx4
-rw-r--r--sw/source/ui/inc/regionsw.hxx4
-rw-r--r--sw/source/ui/inc/rowht.hxx4
-rw-r--r--sw/source/ui/inc/scroll.hxx4
-rw-r--r--sw/source/ui/inc/selglos.hxx4
-rw-r--r--sw/source/ui/inc/sharedconnection.hxx6
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx4
-rw-r--r--sw/source/ui/inc/splittbl.hxx4
-rw-r--r--sw/source/ui/inc/srcedtw.hxx4
-rw-r--r--sw/source/ui/inc/srcview.hxx4
-rw-r--r--sw/source/ui/inc/srtdlg.hxx4
-rw-r--r--sw/source/ui/inc/stmenu.hxx4
-rw-r--r--sw/source/ui/inc/swcont.hxx4
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx4
-rw-r--r--sw/source/ui/inc/swlbox.hxx6
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx4
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx4
-rw-r--r--sw/source/ui/inc/swruler.hxx4
-rw-r--r--sw/source/ui/inc/swtablerep.hxx4
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx4
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx6
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx6
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx4
-rw-r--r--sw/source/ui/inc/swvset.hxx4
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx4
-rw-r--r--sw/source/ui/inc/syncbtn.hxx4
-rw-r--r--sw/source/ui/inc/tabledlg.hxx4
-rw-r--r--sw/source/ui/inc/tablemgr.hxx4
-rw-r--r--sw/source/ui/inc/tabsh.hxx4
-rw-r--r--sw/source/ui/inc/tautofmt.hxx4
-rw-r--r--sw/source/ui/inc/tblctrl.hxx4
-rw-r--r--sw/source/ui/inc/tblnumfm.hxx4
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx4
-rw-r--r--sw/source/ui/inc/textsh.hxx4
-rw-r--r--sw/source/ui/inc/titlepage.hxx4
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx4
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toxmgr.hxx4
-rw-r--r--sw/source/ui/inc/uiitems.hxx6
-rw-r--r--sw/source/ui/inc/uinums.hxx4
-rw-r--r--sw/source/ui/inc/uitool.hxx6
-rw-r--r--sw/source/ui/inc/uivwimp.hxx4
-rw-r--r--sw/source/ui/inc/unoatxt.hxx4
-rw-r--r--sw/source/ui/inc/unodispatch.hxx4
-rw-r--r--sw/source/ui/inc/unomailmerge.hxx4
-rw-r--r--sw/source/ui/inc/unomod.hxx4
-rw-r--r--sw/source/ui/inc/unotools.hxx4
-rw-r--r--sw/source/ui/inc/unotxvw.hxx4
-rw-r--r--sw/source/ui/inc/usrpref.hxx4
-rw-r--r--sw/source/ui/inc/view.hxx4
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx4
-rw-r--r--sw/source/ui/inc/wformsh.hxx4
-rw-r--r--sw/source/ui/inc/wfrmsh.hxx4
-rw-r--r--sw/source/ui/inc/wgrfsh.hxx4
-rw-r--r--sw/source/ui/inc/wlistsh.hxx4
-rw-r--r--sw/source/ui/inc/wolesh.hxx4
-rw-r--r--sw/source/ui/inc/wordcountctrl.hxx4
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/ui/inc/workctrl.hxx4
-rw-r--r--sw/source/ui/inc/wrap.hxx4
-rw-r--r--sw/source/ui/inc/wrtsh.hxx4
-rw-r--r--sw/source/ui/inc/wtabsh.hxx4
-rw-r--r--sw/source/ui/inc/wtextsh.hxx4
-rw-r--r--sw/source/ui/inc/wview.hxx4
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.hxx4
-rw-r--r--sw/source/ui/misc/impfnote.hxx4
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.hxx4
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.hxx4
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.hxx4
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hxx4
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.hxx4
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.hxx4
-rw-r--r--sw/source/ui/table/tablepg.hxx4
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx4
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx4
-rw-r--r--sw/source/ui/uno/swdetect.hxx4
-rw-r--r--sw/source/ui/uno/unodefaults.hxx4
-rw-r--r--sw/source/ui/uno/unomodule.hxx4
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx6
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx6
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx6
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx6
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx6
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx6
-rw-r--r--sw/source/ui/vba/vbaborders.hxx6
-rw-r--r--sw/source/ui/vba/vbacell.hxx6
-rw-r--r--sw/source/ui/vba/vbacells.hxx6
-rw-r--r--sw/source/ui/vba/vbacheckbox.hxx6
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx6
-rw-r--r--sw/source/ui/vba/vbacolumns.hxx6
-rw-r--r--sw/source/ui/vba/vbadialog.hxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx6
-rw-r--r--sw/source/ui/vba/vbadocument.hxx6
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx4
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx6
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx4
-rw-r--r--sw/source/ui/vba/vbafield.hxx4
-rw-r--r--sw/source/ui/vba/vbafind.hxx6
-rw-r--r--sw/source/ui/vba/vbafont.hxx4
-rw-r--r--sw/source/ui/vba/vbaformfield.hxx6
-rw-r--r--sw/source/ui/vba/vbaformfields.hxx6
-rw-r--r--sw/source/ui/vba/vbaframe.hxx6
-rw-r--r--sw/source/ui/vba/vbaframes.hxx6
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx6
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx6
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.hxx4
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.hxx6
-rw-r--r--sw/source/ui/vba/vbainformationhelper.hxx6
-rw-r--r--sw/source/ui/vba/vbalistformat.hxx6
-rw-r--r--sw/source/ui/vba/vbalistgalleries.hxx6
-rw-r--r--sw/source/ui/vba/vbalistgallery.hxx6
-rw-r--r--sw/source/ui/vba/vbalisthelper.hxx6
-rw-r--r--sw/source/ui/vba/vbalistlevel.hxx6
-rw-r--r--sw/source/ui/vba/vbalistlevels.hxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplate.hxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplates.hxx6
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx6
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx4
-rw-r--r--sw/source/ui/vba/vbapalette.hxx4
-rw-r--r--sw/source/ui/vba/vbapane.hxx6
-rw-r--r--sw/source/ui/vba/vbapanes.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx6
-rw-r--r--sw/source/ui/vba/vbarange.hxx6
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx6
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx6
-rw-r--r--sw/source/ui/vba/vbarevision.hxx6
-rw-r--r--sw/source/ui/vba/vbarow.hxx6
-rw-r--r--sw/source/ui/vba/vbarows.hxx6
-rw-r--r--sw/source/ui/vba/vbasection.hxx6
-rw-r--r--sw/source/ui/vba/vbasections.hxx6
-rw-r--r--sw/source/ui/vba/vbaselection.hxx6
-rw-r--r--sw/source/ui/vba/vbastyle.hxx4
-rw-r--r--sw/source/ui/vba/vbastyles.hxx4
-rw-r--r--sw/source/ui/vba/vbasystem.hxx6
-rw-r--r--sw/source/ui/vba/vbatable.hxx4
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx4
-rw-r--r--sw/source/ui/vba/vbatableofcontents.hxx6
-rw-r--r--sw/source/ui/vba/vbatables.hxx4
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.hxx6
-rw-r--r--sw/source/ui/vba/vbatabstop.hxx6
-rw-r--r--sw/source/ui/vba/vbatabstops.hxx6
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx6
-rw-r--r--sw/source/ui/vba/vbavariable.hxx6
-rw-r--r--sw/source/ui/vba/vbavariables.hxx6
-rw-r--r--sw/source/ui/vba/vbaview.hxx6
-rw-r--r--sw/source/ui/vba/vbawindow.hxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx6
-rw-r--r--sw/source/ui/vba/wordvbahelper.hxx4
820 files changed, 1868 insertions, 1869 deletions
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 1612bd4d17a8..1947c5cadf87 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -16,13 +16,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef INCLUDED_SVX_GRFCROP_HXX
#define INCLUDED_SVX_GRFCROP_HXX
#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
-
#define GRFCROP_VERSION_SWDEFAULT 0
#define GRFCROP_VERSION_MOVETOSVX 1
@@ -68,7 +68,6 @@ public:
}
};
-
-#endif // _GRFATR_HXX
+#endif // INCLUDED_SVX_GRFCROP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 67cfe4493742..1c62794bf398 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ANNOTATIONWIN_HXX
-#define _ANNOTATIONWIN_HXX
+#ifndef INCLUDED_SW_INC_ANNOTATIONWIN_HXX
+#define INCLUDED_SW_INC_ANNOTATIONWIN_HXX
#include <SidebarWin.hxx>
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 564dd31fabca..6140be949154 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ENHANCEDPDFEXPORTHELPER_HXX
-#define _ENHANCEDPDFEXPORTHELPER_HXX
+#ifndef INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX
+#define INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX
#include <vcl/pdfextoutdevdata.hxx>
#include <i18nlangtag/lang.h>
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 7ab70c0cfefb..fbd6402baab5 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.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 _HANDLEANCHORNODECHG_HXX
-#define _HANDLEANCHORNODECHG_HXX
+#ifndef INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
+#define INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
class SwFlyFrmFmt;
class SwFmtAnchor;
diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index e75c888d9bbc..8e217ccf5927 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTCHARTDATAPROVIDER_HXX_INCLUDED
- #define IDOCUMENTCHARTDATAPROVIDER_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
#include "com/sun/star/uno/Reference.hxx"
@@ -57,6 +57,6 @@ class SwChartLockController_Helper;
virtual ~IDocumentChartDataProviderAccess() {};
};
- #endif // IDOCUMENTCHARTDATAPROVIDER_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 590d4f60aae7..7bb156bfbe67 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
- #define IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTCONTENTOPERATIONS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTCONTENTOPERATIONS_HXX
#include <sal/types.h>
@@ -175,6 +175,6 @@
virtual ~IDocumentContentOperations() {};
};
-#endif // IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTCONTENTOPERATIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index d519af28fed1..81ac2a31f2df 100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED
- #define IDOCUMENTDEVICEACCESS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
class SfxPrinter;
class JobSetup;
@@ -134,6 +134,6 @@
virtual ~IDocumentDeviceAccess() {};
};
- #endif // IDOCUMENTDEVICEACCESS_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 376ac4d8696a..496f03b9c211 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTDRAWMODEL_HXX_INCLUDED
-#define IDOCUMENTDRAWMODEL_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTDRAWMODELACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTDRAWMODELACCESS_HXX
#include <svx/svdtypes.hxx>
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index dad389052538..3a9313d6bf90 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
-#define INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
+#define INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
@@ -58,6 +58,6 @@ public:
virtual sw::tExternalDataPointer getExternalData(sw::tExternalDataType eType) = 0;
};
-#endif //INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index feccc26082ab..37b51ef7c065 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTLAYOUTACCESS_HXX_INCLUDED
-#define IDOCUMENTLAYOUTACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
#include <swtypes.hxx>
@@ -71,6 +71,6 @@ protected:
virtual ~IDocumentLayoutAccess() {};
};
- #endif // IDOCUMENTLAYOUTACCESS_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx
index 6f52af1163ad..4ed4e9e97e6a 100644
--- a/sw/inc/IDocumentLineNumberAccess.hxx
+++ b/sw/inc/IDocumentLineNumberAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
- #define IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
#include <sal/types.h>
@@ -37,6 +37,6 @@ class SwLineNumberInfo;
virtual ~IDocumentLineNumberAccess() {};
};
-#endif // IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 674bc32c9754..a0b3ee6851d0 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
-#define IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
+#define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
#include <tools/solar.h>
@@ -65,6 +65,6 @@ protected:
virtual ~IDocumentLinksAdministration() {};
};
- #endif // IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index c6ced05615d7..f5de583f6e88 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTLISTITEMS_HXX_INCLUDED
-#define IDOCUMENTLISTITEMS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTLISTITEMS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTLISTITEMS_HXX
#include <vector>
#include <rtl/ustring.hxx>
@@ -50,6 +50,6 @@ protected:
virtual ~IDocumentListItems() {};
};
- #endif // IDOCUMENTLISTITEMS_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTLISTITEMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index 4351d6fe28b1..590ec8ca9f6f 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTLISTSACCESS_HXX_INCLUDED
-#define IDOCUMENTLISTSACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTLISTSACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTLISTSACCESS_HXX
#include <rtl/ustring.hxx>
@@ -44,6 +44,6 @@ class IDocumentListsAccess
virtual ~IDocumentListsAccess() {};
};
-#endif // IDOCUMENTLISTSACCESS_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTLISTSACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 35f5ec04cd57..739bc4f6a7f9 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTMARKACCESS_HXX_INCLUDED
-#define IDOCUMENTMARKACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTMARKACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTMARKACCESS_HXX
#include <sal/types.h>
#include <IMark.hxx>
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 0fc0156f2a66..a522cea02839 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTOUTLINENODES_HXX_INCLUDED
-#define IDOCUMENTOUTLINENODES_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTOUTLINENODES_HXX
+#define INCLUDED_SW_INC_IDOCUMENTOUTLINENODES_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -46,6 +46,6 @@ protected:
virtual ~IDocumentOutlineNodes() {};
};
- #endif // IDOCUMENTOUTLINENODES_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTOUTLINENODES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 690b5b8c2e65..8fd1555a68f7 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTREDLINE_HXX_INCLUDED
- #define IDOCUMENTREDLINE_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
#include <sal/types.h>
#include <tools/solar.h>
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 73c14f9abb27..6e66fd018d63 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTSETTINGACCESS_HXX_INCLUDED
-#define IDOCUMENTSETTINGACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
#include <tools/solar.h>
#include <rtl/ref.hxx>
@@ -212,6 +212,6 @@ protected:
virtual ~IDocumentSettingAccess() {};
};
-#endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 477e18229294..330b3934ad76 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTSTATE_HXX_INCLUDED
- #define IDOCUMENTSTATE_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
#include <tools/solar.h>
@@ -60,6 +60,6 @@
virtual ~IDocumentState() {};
};
- #endif // IDOCUMENTSTATE_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 950ea49236f1..9b58b5ad94ac 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTSTATISTICS_HXX_INCLUDED
- #define IDOCUMENTSTATISTICS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
struct SwDocStat;
@@ -62,6 +62,6 @@ protected:
virtual ~IDocumentStatistics() {};
};
- #endif // IDOCUMENTSTATISTICS_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 48ec5853bb98..fcf3e1cbd2da 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
- #define IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
#include <sal/types.h>
@@ -68,6 +68,6 @@
virtual ~IDocumentStylePoolAccess() {};
};
-#endif // IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index b2229f9a90e3..cde3d88b4c86 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IDOCUMENTTIMERACCESS_HXX_INCLUDED
- #define IDOCUMENTTIMERACCESS_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
+ #define INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
/** Manipulate background jobs of the document. It starts with a mode of
'started' and a block count of 0.
@@ -59,6 +59,6 @@
virtual ~IDocumentTimerAccess() {};
};
- #endif // IDOCUMENTTIMERACCESS_HXX_INCLUDED
+ #endif // INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 4cad09c5c6bf..02d6504fe73d 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IDOCUMENTUNDOREDO_HXX_INCLUDED
-#define IDOCUMENTUNDOREDO_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTUNDOREDO_HXX
+#define INCLUDED_SW_INC_IDOCUMENTUNDOREDO_HXX
#include <sal/types.h>
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 7b8407762f4f..62c053f90fcb 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IGRAMMARCONTACT_HXX_INCLUDED
-#define IGRAMMARCONTACT_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
+#define INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
struct SwPosition;
class SwTxtNode;
@@ -75,6 +75,6 @@ IGrammarContact* getGrammarContact( const SwTxtNode& );
*/
void finishGrammarCheck( SwTxtNode& );
-#endif // IGRAMMARCONTACT_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IInterface.hxx b/sw/inc/IInterface.hxx
index c7ff9c3f3364..fd7f9dd7d16c 100644
--- a/sw/inc/IInterface.hxx
+++ b/sw/inc/IInterface.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef IINTERFACE_HXX_INCLUDED
- #define IINTERFACE_HXX_INCLUDED
+ #ifndef INCLUDED_SW_INC_IINTERFACE_HXX
+ #define INCLUDED_SW_INC_IINTERFACE_HXX
#include <sal/types.h>
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index f0e20a6511a8..8359e2eac0b5 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.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 _IMARK_HXX
-#define _IMARK_HXX
+#ifndef INCLUDED_SW_INC_IMARK_HXX
+#define INCLUDED_SW_INC_IMARK_HXX
#include <vcl/keycod.hxx>
#include <calbck.hxx>
diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx
index 997d84c335d7..fe7c690c6425 100644
--- a/sw/inc/IShellCursorSupplier.hxx
+++ b/sw/inc/IShellCursorSupplier.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef ISHELLCURSORSUPPLIER_HXX
-#define ISHELLCURSORSUPPLIER_HXX
+#ifndef INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
+#define INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
class SwPaM;
@@ -40,6 +40,6 @@ public:
} // namespace sw
-#endif // ISHELLCURSORSUPPLIER_HXX
+#endif // INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 888a5ac772c2..4c38d4053f12 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef POSTITMGR_HXX
-#define POSTITMGR_HXX
+#ifndef INCLUDED_SW_INC_POSTITMGR_HXX
+#define INCLUDED_SW_INC_POSTITMGR_HXX
#include <list>
#include <vector>
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index cbd728df77fa..b3c4c820476b 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARWIN_HXX
-#define _SIDEBARWIN_HXX
+#ifndef INCLUDED_SW_INC_SIDEBARWIN_HXX
+#define INCLUDED_SW_INC_SIDEBARWIN_HXX
#include <postithelper.hxx>
#include <SidebarWindowsTypes.hxx>
diff --git a/sw/inc/SidebarWindowsTypes.hxx b/sw/inc/SidebarWindowsTypes.hxx
index 7c34c45e6a1f..4933c21d892e 100644
--- a/sw/inc/SidebarWindowsTypes.hxx
+++ b/sw/inc/SidebarWindowsTypes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARWINDOWSTYPES_HXX
-#define _SIDEBARWINDOWSTYPES_HXX
+#ifndef INCLUDED_SW_INC_SIDEBARWINDOWSTYPES_HXX
+#define INCLUDED_SW_INC_SIDEBARWINDOWSTYPES_HXX
namespace sw { namespace sidebarwindows {
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 1fe6f9795900..c41fd2c6de53 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_APPLET_IMPL_HXX
-#define _SW_APPLET_IMPL_HXX
+#ifndef INCLUDED_SW_INC_SWAPPLETIMPL_HXX
+#define INCLUDED_SW_INC_SWAPPLETIMPL_HXX
#include <config_features.h>
diff --git a/sw/inc/SwCapObjType.hxx b/sw/inc/SwCapObjType.hxx
index 4dbbc5ce9984..abae5349f22e 100644
--- a/sw/inc/SwCapObjType.hxx
+++ b/sw/inc/SwCapObjType.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 _SWCAPOBJTYPE_HXX
-#define _SWCAPOBJTYPE_HXX
+#ifndef INCLUDED_SW_INC_SWCAPOBJTYPE_HXX
+#define INCLUDED_SW_INC_SWCAPOBJTYPE_HXX
enum SwCapObjType
{
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index bcab6fb5fb63..9d93e26ec65b 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.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 _GETPOOLIDFROMNAMEENUM_HXX
-#define _GETPOOLIDFROMNAMEENUM_HXX
+#ifndef INCLUDED_SW_INC_SWGETPOOLIDFROMNAME_HXX
+#define INCLUDED_SW_INC_SWGETPOOLIDFROMNAME_HXX
/* When using the NameMapper to translate pool ids to UI or programmatic
* names, this enum is used to define which family is required */
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 768e69f284fd..7a0e24382197 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_NODE_NUM_HXX
-#define _SW_NODE_NUM_HXX
+#ifndef INCLUDED_SW_INC_SWNODENUM_HXX
+#define INCLUDED_SW_INC_SWNODENUM_HXX
#include <SwNumberTree.hxx>
@@ -97,6 +97,6 @@ private:
virtual void NotifyNode();
};
-#endif // _SW_NODE_NUM_HXX
+#endif // INCLUDED_SW_INC_SWNODENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 2812a896f611..8b814d5553d9 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_NUMBER_TREE_HXX
-#define _SW_NUMBER_TREE_HXX
+#ifndef INCLUDED_SW_INC_SWNUMBERTREE_HXX
+#define INCLUDED_SW_INC_SWNUMBERTREE_HXX
#include <set>
#include <vector>
@@ -693,6 +693,6 @@ struct SwNumberTreeNodeIsLessThan
bool operator()(const SwNumberTreeNode * _pNode) const
{ return SwNumberTreeNodeLessThan(_pNode, pNode); }
};
-#endif // _SW_NUMBER_TREE_HXX
+#endif // INCLUDED_SW_INC_SWNUMBERTREE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTreeTypes.hxx b/sw/inc/SwNumberTreeTypes.hxx
index 75008d2244e5..e05fa667ffc3 100644
--- a/sw/inc/SwNumberTreeTypes.hxx
+++ b/sw/inc/SwNumberTreeTypes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_NUMBER_TREE_TYPES_HXX
-#define _SW_NUMBER_TREE_TYPES_HXX
+#ifndef INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
+#define INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
#include <vector>
@@ -28,6 +28,6 @@ namespace SwNumberTree
typedef std::vector<tSwNumTreeNumber> tNumberVector;
}
-#endif // _SW_NUMBER_TREE_TYPES_HXX
+#endif // INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwPanelFactory.hxx b/sw/inc/SwPanelFactory.hxx
index 7e6d19cefdc1..23e352dcef8c 100644
--- a/sw/inc/SwPanelFactory.hxx
+++ b/sw/inc/SwPanelFactory.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 SW_SIDEBAR_PANEL_FACTORY_HXX
-#define SW_SIDEBAR_PANEL_FACTORY_HXX
+#ifndef INCLUDED_SW_INC_SWPANELFACTORY_HXX
+#define INCLUDED_SW_INC_SWPANELFACTORY_HXX
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index ecf28ce13b5f..2e060c4f1b3c 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_REWRITER_HXX
-#define _SW_REWRITER_HXX
+#ifndef INCLUDED_SW_INC_SWREWRITER_HXX
+#define INCLUDED_SW_INC_SWREWRITER_HXX
#include <vector>
#include <rtl/ustring.hxx>
@@ -49,6 +49,6 @@ public:
static OUString GetPlaceHolder(SwUndoArg eId);
};
-#endif // _SW_REWRITER_HXX
+#endif // INCLUDED_SW_INC_SWREWRITER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 6480ab2d5b2e..c6a96fdfd133 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWSMARTTAGMGR_HXX
-#define _SWSMARTTAGMGR_HXX
+#ifndef INCLUDED_SW_INC_SWSMARTTAGMGR_HXX
+#define INCLUDED_SW_INC_SWSMARTTAGMGR_HXX
#include <svx/SmartTagMgr.hxx>
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index e2fdedec8302..d80694271f5b 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.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 SWSTYLENAMEMAPPER_HXX
-#define SWSTYLENAMEMAPPER_HXX
+#ifndef INCLUDED_SW_INC_SWSTYLENAMEMAPPER_HXX
+#define INCLUDED_SW_INC_SWSTYLENAMEMAPPER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 0d52126fc078..6a1d318acb99 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.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 SW_UNDO_FIELD_HXX
-#define SW_UNDO_FIELD_HXX
+#ifndef INCLUDED_SW_INC_SWUNDOFIELD_HXX
+#define INCLUDED_SW_INC_SWUNDOFIELD_HXX
#include <undobj.hxx>
@@ -82,6 +82,6 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & );
};
-#endif // SW_UNDO_FIELD_HXX
+#endif // INCLUDED_SW_INC_SWUNDOFIELD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 68eb8fd8f0bd..9e63504598a5 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.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 _SW_XMLSECTIONLIST_HXX
-#define _SW_XMLSECTIONLIST_HXX
+#ifndef INCLUDED_SW_INC_SWXMLSECTIONLIST_HXX
+#define INCLUDED_SW_INC_SWXMLSECTIONLIST_HXX
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index cf822c0dba77..d2b538826191 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.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 _SW_TEXTCURSORHELPER_HXX
-#define _SW_TEXTCURSORHELPER_HXX
+#ifndef INCLUDED_SW_INC_TEXTCURSORHELPER_HXX
+#define INCLUDED_SW_INC_TEXTCURSORHELPER_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -44,7 +44,7 @@ protected:
~OTextCursorHelper() {}
};
-#endif // _SW_TEXTCURSORHELPER_HXX
+#endif // INCLUDED_SW_INC_TEXTCURSORHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index bacecc9123a5..e80f2685f036 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.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 _ACCESSIBILITYOPTIONS_HXX
-#define _ACCESSIBILITYOPTIONS_HXX
+#ifndef INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
+#define INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
#include <tools/solar.h>
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 5174c89d9ee9..6df63884b7da 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.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 _ACCMAP_HXX
-#define _ACCMAP_HXX
+#ifndef INCLUDED_SW_INC_ACCMAP_HXX
+#define INCLUDED_SW_INC_ACCMAP_HXX
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 47795c46340e..2a9f3d2c8201 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_ACMPLWRD_HXX
-#define SW_ACMPLWRD_HXX
+#ifndef INCLUDED_SW_INC_ACMPLWRD_HXX
+#define INCLUDED_SW_INC_ACMPLWRD_HXX
#include <deque>
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 4c26983953e4..83b96f6bae12 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.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 _ANCHOREDDRAWOBJECT_HXX
-#define _ANCHOREDDRAWOBJECT_HXX
+#ifndef INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX
+#define INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX
#include <anchoredobject.hxx>
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index cc5edbfb17b0..7e304fdac829 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.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 _ANCHOREDOBJECT_HXX
-#define _ANCHOREDOBJECT_HXX
+#ifndef INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
+#define INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
#include <tools/rtti.hxx>
#include <swtypes.hxx>
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index e38532936967..202a8534f099 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.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 SW_AUTHFLD_HXX
-#define SW_AUTHFLD_HXX
+#ifndef INCLUDED_SW_INC_AUTHFLD_HXX
+#define INCLUDED_SW_INC_AUTHFLD_HXX
#include "swdllapi.h"
#include <fldbas.hxx>
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 887042166768..865092a7abfe 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AUTHRATR_HXX
-#define _AUTHRATR_HXX
+#ifndef INCLUDED_SW_INC_AUTHRATR_HXX
+#define INCLUDED_SW_INC_AUTHRATR_HXX
#include <tools/solar.h>
#include <tools/color.hxx>
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 5b0cda20039e..0d517e0dd679 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_BPARR_HXX
-#define SW_BPARR_HXX
+#ifndef INCLUDED_SW_INC_BPARR_HXX
+#define INCLUDED_SW_INC_BPARR_HXX
#include <assert.h>
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 0776ae648cb2..497dcf005e68 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BREAKIT_HXX
-#define _BREAKIT_HXX
+#ifndef INCLUDED_SW_INC_BREAKIT_HXX
+#define INCLUDED_SW_INC_BREAKIT_HXX
#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 105ba9dd4aec..863608539faf 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CALBCK_HXX
-#define _CALBCK_HXX
+#ifndef INCLUDED_SW_INC_CALBCK_HXX
+#define INCLUDED_SW_INC_CALBCK_HXX
#include <tools/rtti.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index d75420345b16..9b83a5c6a1cd 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_CALC_HXX
-#define SW_CALC_HXX
+#ifndef INCLUDED_SW_INC_CALC_HXX
+#define INCLUDED_SW_INC_CALC_HXX
#include <vector>
#include <basic/sbxvar.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index e3f64d88a4fb..bcf05bdbe3b9 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.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 _CCOLL_HXX
-#define _CCOLL_HXX
+#ifndef INCLUDED_SW_INC_CCOLL_HXX
+#define INCLUDED_SW_INC_CCOLL_HXX
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 3a71cb24c2f0..31eecf5c290d 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CELLATR_HXX
-#define CELLATR_HXX
+#ifndef INCLUDED_SW_INC_CELLATR_HXX
+#define INCLUDED_SW_INC_CELLATR_HXX
#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 0c9b90e9dd6e..abece1eaecc2 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CELLFML_HXX
-#define _CELLFML_HXX
+#ifndef INCLUDED_SW_INC_CELLFML_HXX
+#define INCLUDED_SW_INC_CELLFML_HXX
#include <rtl/ustring.hxx>
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index da9e34a8c3e0..40d43046d505 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.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 _CHARATR_HXX
-#define _CHARATR_HXX
+#ifndef INCLUDED_SW_INC_CHARATR_HXX
+#define INCLUDED_SW_INC_CHARATR_HXX
#include <format.hxx>
#include <hintids.hxx>
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 0bc2ff09032d..3876be6b62bf 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.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 _CHARFMT_HXX
-#define _CHARFMT_HXX
+#ifndef INCLUDED_SW_INC_CHARFMT_HXX
+#define INCLUDED_SW_INC_CHARFMT_HXX
#include <format.hxx>
diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx
index ba4bd653ba68..963aaee805ec 100644
--- a/sw/inc/chcmprse.hxx
+++ b/sw/inc/chcmprse.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHCMPRSE_HXX
-#define _CHCMPRSE_HXX
+#ifndef INCLUDED_SW_INC_CHCMPRSE_HXX
+#define INCLUDED_SW_INC_CHCMPRSE_HXX
enum SwCharCompressType{ CHARCOMPRESS_NONE,
CHARCOMPRESS_PUNCTUATION,
diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx
index d2db9f184b82..b26c51e02cb7 100644
--- a/sw/inc/checkit.hxx
+++ b/sw/inc/checkit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHECKIT_HXX
-#define _CHECKIT_HXX
+#ifndef INCLUDED_SW_INC_CHECKIT_HXX
+#define INCLUDED_SW_INC_CHECKIT_HXX
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 1a87f43e888b..ef9d86ed1f49 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.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 SW_CHPFLD_HXX
-#define SW_CHPFLD_HXX
+#ifndef INCLUDED_SW_INC_CHPFLD_HXX
+#define INCLUDED_SW_INC_CHPFLD_HXX
#include "fldbas.hxx"
@@ -82,6 +82,6 @@ inline void SwChapterField::SetLevel(sal_uInt8 nLev) { nLevel = nLev; }
inline OUString SwChapterField::GetNumber() const { return sNumber; }
inline OUString SwChapterField::GetTitle() const { return sTitle; }
-#endif // SW_CHPFLD_HXX
+#endif // INCLUDED_SW_INC_CHPFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 94b83513f032..a7977f82a4c6 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -22,8 +22,8 @@ Attention : "In this file C++ style // comments are not allowed as it will be
included in c-context files, so c++ style stuff will cause problems.
******************************************************************************/
-#ifndef INCLUDED_SW_CMDID_H
-#define INCLUDED_SW_CMDID_H
+#ifndef INCLUDED_SW_INC_CMDID_H
+#define INCLUDED_SW_INC_CMDID_H
#include <sfx2/sfx.hrc>
#include <unomid.h>
@@ -942,6 +942,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define MAC_EVENT_IMAGE_ABORT 0x0a //
#define MAC_EVENT_IMAGE_ERROR 0x0b //
-#endif /* INCLUDED_SW_CMDID_H */
+#endif // INCLUDED_SW_INC_CMDID_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index b4e23c876e88..eb3495314f85 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.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 _COLWD_HXX
-#define _COLWD_HXX
+#ifndef INCLUDED_SW_INC_COLWD_HXX
+#define INCLUDED_SW_INC_COLWD_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index bf09a55defda..cc8699030e50 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.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 SW_CRSRSH_HXX
-#define SW_CRSRSH_HXX
+#ifndef INCLUDED_SW_INC_CRSRSH_HXX
+#define INCLUDED_SW_INC_CRSRSH_HXX
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 97d1b6343530..6dae1e2e3392 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CRSSKIP_HXX
-#define _CRSSKIP_HXX
+#ifndef INCLUDED_SW_INC_CRSSKIP_HXX
+#define INCLUDED_SW_INC_CRSSKIP_HXX
#include <tools/solar.h>
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 7bd3cb4b5c4b..0adcdd2aa2d2 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.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 _CRSTATE_HXX
-#define _CRSTATE_HXX
+#ifndef INCLUDED_SW_INC_CRSTATE_HXX
+#define INCLUDED_SW_INC_CRSTATE_HXX
#include <com/sun/star/text/HoriOrientation.hpp>
#include <tools/gen.hxx>
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index a38bc7f00782..c5a188200c48 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.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 _CSHTYP_HXX
-#define _CSHTYP_HXX
+#ifndef INCLUDED_SW_INC_CSHTYP_HXX
+#define INCLUDED_SW_INC_CSHTYP_HXX
#include <tools/solar.h>
#include "swdllapi.h"
@@ -105,6 +105,6 @@ SW_DLLPUBLIC SwWhichTable GetfnTableCurr();
SW_DLLPUBLIC SwPosTable GetfnTableStart();
SW_DLLPUBLIC SwPosTable GetfnTableEnd();
-#endif // _CSHTYP_HXX
+#endif // INCLUDED_SW_INC_CSHTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 20d62890c8d2..83da26a9c1be 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.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 SW_DBFLD_HXX
-#define SW_DBFLD_HXX
+#ifndef INCLUDED_SW_INC_DBFLD_HXX
+#define INCLUDED_SW_INC_DBFLD_HXX
#include "swdllapi.h"
#include "fldbas.hxx"
@@ -319,6 +319,6 @@ inline long SwDBSetNumberField::GetSetNumber() const
inline void SwDBSetNumberField::SetSetNumber(long nNum)
{ nNumber = nNum; }
-#endif // SW_DBFLD_HXX
+#endif // INCLUDED_SW_INC_DBFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 8ad766fe43e9..2f9ca3b8ce3d 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.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 __DBGOUTSW_HXX
-#define __DBGOUTSW_HXX
+#ifndef INCLUDED_SW_INC_DBGOUTSW_HXX
+#define INCLUDED_SW_INC_DBGOUTSW_HXX
#ifdef DBG_UTIL
@@ -103,6 +103,6 @@ const char * dbg_out(const boost::unordered_map<tKey, tMember, fHashFunction> &
SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken);
SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens);
#endif // DBG_UTIL
-#endif // __DBGOUTSW_HXX
+#endif // INCLUDED_SW_INC_DBGOUTSW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b1d57ef7f6d3..daee01afed20 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.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 _SWDBMGR_HXX
-#define _SWDBMGR_HXX
+#ifndef INCLUDED_SW_INC_DBMGR_HXX
+#define INCLUDED_SW_INC_DBMGR_HXX
#include <rtl/ustring.hxx>
#include <tools/link.hxx>
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 6dc76cb196c6..739fc743857c 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.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 _DCONTACT_HXX
-#define _DCONTACT_HXX
+#ifndef INCLUDED_SW_INC_DCONTACT_HXX
+#define INCLUDED_SW_INC_DCONTACT_HXX
#include <svx/svdobj.hxx>
#include <svx/svdovirt.hxx>
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 917d90fbe641..867d1e2fbd9e 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.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 SW_DDEFLD_HXX
-#define SW_DDEFLD_HXX
+#ifndef INCLUDED_SW_INC_DDEFLD_HXX
+#define INCLUDED_SW_INC_DDEFLD_HXX
#include <sfx2/lnkbase.hxx>
#include "swdllapi.h"
@@ -107,6 +107,6 @@ public:
};
-#endif // SW_DDEFLD_HXX
+#endif // INCLUDED_SW_INC_DDEFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index acf9f2a2a6a4..4ef46940b533 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DLELSTNR_HXX_
-#define _DLELSTNR_HXX_
+#ifndef INCLUDED_SW_INC_DLELSTNR_HXX
+#define INCLUDED_SW_INC_DLELSTNR_HXX
#include <cppuhelper/weak.hxx>
#include <com/sun/star/linguistic2/XDictionaryListEventListener.hpp>
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx
index 92fb794f6870..1b2e9cfbbae3 100644
--- a/sw/inc/dobjfac.hxx
+++ b/sw/inc/dobjfac.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 _DOBJFAC_HXX
-#define _DOBJFAC_HXX
+#ifndef INCLUDED_SW_INC_DOBJFAC_HXX
+#define INCLUDED_SW_INC_DOBJFAC_HXX
#include <tools/link.hxx>
@@ -35,6 +35,6 @@ public:
extern SwObjectFactory aSwObjectFactory;
-#endif // _DOBJFAC_HXX
+#endif // INCLUDED_SW_INC_DOBJFAC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 465443a977c3..f67b38bac53d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.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 SW_DOC_HXX
-#define SW_DOC_HXX
+#ifndef INCLUDED_SW_INC_DOC_HXX
+#define INCLUDED_SW_INC_DOC_HXX
/** SwDoc interfaces */
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 44e1d4ea2cf1..4525763749a3 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.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 _DOCARY_HXX
-#define _DOCARY_HXX
+#ifndef INCLUDED_SW_INC_DOCARY_HXX
+#define INCLUDED_SW_INC_DOCARY_HXX
#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include <vector>
@@ -189,6 +189,6 @@ public:
class SwOLENodes : public std::vector<SwOLENode*> {};
-#endif //_DOCARY_HXX
+#endif // INCLUDED_SW_INC_DOCARY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index c091b22cd358..a4532827cf2e 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.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 _DOCFAC_HXX
-#define _DOCFAC_HXX
+#ifndef INCLUDED_SW_INC_DOCFAC_HXX
+#define INCLUDED_SW_INC_DOCFAC_HXX
#include <tools/solar.h>
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 1891f3ad126d..9c8f841a0dae 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.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 _SWDOCSH_HXX
-#define _SWDOCSH_HXX
+#ifndef INCLUDED_SW_INC_DOCSH_HXX
+#define INCLUDED_SW_INC_DOCSH_HXX
#include <rtl/ref.hxx>
#include <com/sun/star/frame/XController.hpp>
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index ab88e8fea179..704c739b8f61 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.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 _DOCSTAT_HXX
-#define _DOCSTAT_HXX
+#ifndef INCLUDED_SW_INC_DOCSTAT_HXX
+#define INCLUDED_SW_INC_DOCSTAT_HXX
#include <tools/solar.h>
#include "swdllapi.h"
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 6ca9cc5367d8..8620cd865a45 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.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 SW_DOCSTYLE_HXX
-#define SW_DOCSTYLE_HXX
+#ifndef INCLUDED_SW_INC_DOCSTYLE_HXX
+#define INCLUDED_SW_INC_DOCSTYLE_HXX
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 529bf14ea8f7..38ce19dac51d 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.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 SW_DOCUFLD_HXX
-#define SW_DOCUFLD_HXX
+#ifndef INCLUDED_SW_INC_DOCUFLD_HXX
+#define INCLUDED_SW_INC_DOCUFLD_HXX
#include <tools/date.hxx>
@@ -849,6 +849,6 @@ public:
};
-#endif // SW_DOCUFLD_HXX
+#endif // INCLUDED_SW_INC_DOCUFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 7f0fc976314c..b86460a36db4 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.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 _DPAGE_HXX
-#define _DPAGE_HXX
+#ifndef INCLUDED_SW_INC_DPAGE_HXX
+#define INCLUDED_SW_INC_DPAGE_HXX
#include <svx/fmpage.hxx>
#include <svx/svdobj.hxx>
@@ -48,7 +48,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
};
-#endif // _DPAGE_HXX
+#endif // INCLUDED_SW_INC_DPAGE_HXX
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index f98d6b1cc72f..16cf557396ee 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.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 _EDGLBLDC_HXX
-#define _EDGLBLDC_HXX
+#ifndef INCLUDED_SW_INC_EDGLBLDC_HXX
+#define INCLUDED_SW_INC_EDGLBLDC_HXX
#include <o3tl/sorted_vector.hxx>
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 8e251ff725f7..1434f3e297cb 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EDIMP_HXX
-#define _EDIMP_HXX
+#ifndef INCLUDED_SW_INC_EDIMP_HXX
+#define INCLUDED_SW_INC_EDIMP_HXX
#include <tools/solar.h>
#include <o3tl/sorted_vector.hxx>
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8807eb24cb34..bbafef9e22a3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.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 _EDITSH_HXX
-#define _EDITSH_HXX
+#ifndef INCLUDED_SW_INC_EDITSH_HXX
+#define INCLUDED_SW_INC_EDITSH_HXX
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index bca2b0bf19a3..978a89140afb 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.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 SW_EXPFLD_HXX
-#define SW_EXPFLD_HXX
+#ifndef INCLUDED_SW_INC_EXPFLD_HXX
+#define INCLUDED_SW_INC_EXPFLD_HXX
#include "swdllapi.h"
#include <fldbas.hxx>
@@ -407,6 +407,6 @@ public:
};
-#endif // SW_EXPFLD_HXX
+#endif // INCLUDED_SW_INC_EXPFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index 7b760e905d7d..bd39df3aa757 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.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 EXTINPUT_HXX
-#define EXTINPUT_HXX
+#ifndef INCLUDED_SW_INC_EXTINPUT_HXX
+#define INCLUDED_SW_INC_EXTINPUT_HXX
#include <pam.hxx>
#include <i18nlangtag/lang.h>
@@ -44,6 +44,6 @@ public:
void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;}
};
-#endif //EXTINPUT_HXX
+#endif // INCLUDED_SW_INC_EXTINPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 1e05890d56a6..0a99f079613c 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.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 _FCHRFMT_HXX
-#define _FCHRFMT_HXX
+#ifndef INCLUDED_SW_INC_FCHRFMT_HXX
+#define INCLUDED_SW_INC_FCHRFMT_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 4af57ac91be3..9daebe88256a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.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 _FESH_HXX
-#define _FESH_HXX
+#ifndef INCLUDED_SW_INC_FESH_HXX
+#define INCLUDED_SW_INC_FESH_HXX
#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index e90d81317455..661dd78bc020 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.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 SW_FLDBAS_HXX
-#define SW_FLDBAS_HXX
+#ifndef INCLUDED_SW_INC_FLDBAS_HXX
+#define INCLUDED_SW_INC_FLDBAS_HXX
#include <i18nlangtag/lang.h>
#include "swdllapi.h"
@@ -429,6 +429,6 @@ public:
OUString GetExpandedFormula() const;
};
-#endif // SW_FLDBAS_HXX
+#endif // INCLUDED_SW_INC_FLDBAS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index ea2c2cfaeb63..d1cea2d08958 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_FLDDAT_HXX
-#define SW_FLDDAT_HXX
+#ifndef INCLUDED_SW_INC_FLDDAT_HXX
+#define INCLUDED_SW_INC_FLDDAT_HXX
#include "fldbas.hxx"
@@ -126,6 +126,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId );
};
-#endif // SW_FLDDAT_HXX
+#endif // INCLUDED_SW_INC_FLDDAT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index bf943a169502..8ba7905909f4 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.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 SW_FLDDROPDOWN_HXX
-#define SW_FLDDROPDOWN_HXX
+#ifndef INCLUDED_SW_INC_FLDDROPDOWN_HXX
+#define INCLUDED_SW_INC_FLDDROPDOWN_HXX
#include "com/sun/star/uno/Sequence.hxx"
#include "swdllapi.h"
diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx
index 95468a3e349d..ed78edc6636d 100644
--- a/sw/inc/fldupde.hxx
+++ b/sw/inc/fldupde.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 _FLDUPDE_HXX
-#define _FLDUPDE_HXX
+#ifndef INCLUDED_SW_INC_FLDUPDE_HXX
+#define INCLUDED_SW_INC_FLDUPDE_HXX
enum SwFldUpdateFlags
{
diff --git a/sw/inc/flyenum.hxx b/sw/inc/flyenum.hxx
index ec0c42adf228..fc48ac5a6c88 100644
--- a/sw/inc/flyenum.hxx
+++ b/sw/inc/flyenum.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FLYENUM_HXX
-#define _FLYENUM_HXX
+#ifndef INCLUDED_SW_INC_FLYENUM_HXX
+#define INCLUDED_SW_INC_FLYENUM_HXX
enum FlyCntType
{
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index e7b9fa010267..c4b5ab74666f 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.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 _FLYPOS_HXX
-#define _FLYPOS_HXX
+#ifndef INCLUDED_SW_INC_FLYPOS_HXX
+#define INCLUDED_SW_INC_FLYPOS_HXX
#include <swdllapi.h>
#include <boost/shared_ptr.hpp>
@@ -51,6 +51,6 @@ typedef ::boost::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
typedef ::std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
-#endif // _FLYPOS_HXX
+#endif // INCLUDED_SW_INC_FLYPOS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 7c3d665a7eee..d048dce72d75 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.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 _FMTANCHR_HXX
-#define _FMTANCHR_HXX
+#ifndef INCLUDED_SW_INC_FMTANCHR_HXX
+#define INCLUDED_SW_INC_FMTANCHR_HXX
#include "swdllapi.h"
#include <hintids.hxx>
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 0a3498fea5e7..dd6bf3b2e8c1 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.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 _FMTAUTOFMT_HXX
-#define _FMTAUTOFMT_HXX
+#ifndef INCLUDED_SW_INC_FMTAUTOFMT_HXX
+#define INCLUDED_SW_INC_FMTAUTOFMT_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 263292161db1..d9e1b4e785ef 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.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 _FMTCLBL_HXX
-#define _FMTCLBL_HXX
+#ifndef INCLUDED_SW_INC_FMTCLBL_HXX
+#define INCLUDED_SW_INC_FMTCLBL_HXX
#include <svl/eitem.hxx>
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 71f039ac059d..3fe065ca1c3c 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.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 _FMTCLDS_HXX
-#define _FMTCLDS_HXX
+#ifndef INCLUDED_SW_INC_FMTCLDS_HXX
+#define INCLUDED_SW_INC_FMTCLDS_HXX
#include <editeng/borderline.hxx>
#include <tools/color.hxx>
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index efdda3e20631..c0dd7c0458d4 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.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 _FMTCNCT_HXX
-#define _FMTCNCT_HXX
+#ifndef INCLUDED_SW_INC_FMTCNCT_HXX
+#define INCLUDED_SW_INC_FMTCNCT_HXX
#include <hintids.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 2e96d41b50a4..57c020086ade 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.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 _FMTCNTNT_HXX
-#define _FMTCNTNT_HXX
+#ifndef INCLUDED_SW_INC_FMTCNTNT_HXX
+#define INCLUDED_SW_INC_FMTCNTNT_HXX
#include <svl/poolitem.hxx>
#include <hintids.hxx>
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 280effdd776c..0db5c3658313 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.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 _FMTCOL_HXX
-#define _FMTCOL_HXX
+#ifndef INCLUDED_SW_INC_FMTCOL_HXX
+#define INCLUDED_SW_INC_FMTCOL_HXX
#include "swdllapi.h"
#include <frmatr.hxx>
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index 3281955e5afd..e8b4771908c9 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.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 _FMTCOLFUNC_HXX
-#define _FMTCOLFUNC_HXX
+#ifndef INCLUDED_SW_INC_FMTCOLFUNC_HXX
+#define INCLUDED_SW_INC_FMTCOLFUNC_HXX
class SwFmt;
class SwNumRuleItem;
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index efd2be8ed7c6..cddba4754283 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.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 _FMTEIRO_HXX
-#define _FMTEIRO_HXX
+#ifndef INCLUDED_SW_INC_FMTEIRO_HXX
+#define INCLUDED_SW_INC_FMTEIRO_HXX
#include <svl/eitem.hxx>
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 8aef1012939a..2bd7b9358a8a 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.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 _FMTFLCNT_HXX
-#define _FMTFLCNT_HXX
+#ifndef INCLUDED_SW_INC_FMTFLCNT_HXX
+#define INCLUDED_SW_INC_FMTFLCNT_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 67ace36dc7fe..b76dd23afb15 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_FMTFLD_HXX
-#define SW_FMTFLD_HXX
+#ifndef INCLUDED_SW_INC_FMTFLD_HXX
+#define INCLUDED_SW_INC_FMTFLD_HXX
#include <list>
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index e9dce29751e4..a28f97976d3c 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.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 _FMTFOLLOWTEXTFLOW_HXX
-#define _FMTFOLLOWTEXTFLOW_HXX
+#ifndef INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
+#define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
#include <svl/eitem.hxx>
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 630569e2c4b2..6ba2a23de68d 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.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 _FMTFORDR_HXX
-#define _FMTFORDR_HXX
+#ifndef INCLUDED_SW_INC_FMTFORDR_HXX
+#define INCLUDED_SW_INC_FMTFORDR_HXX
#include <svl/eitem.hxx>
#include <hintids.hxx>
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 2cd26ba0e9ab..02d3be616cde 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.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 _FMTFSIZE_HXX
-#define _FMTFSIZE_HXX
+#ifndef INCLUDED_SW_INC_FMTFSIZE_HXX
+#define INCLUDED_SW_INC_FMTFSIZE_HXX
#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index a1d310922819..ab290e3ac332 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.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 _FMTFTN_HXX
-#define _FMTFTN_HXX
+#ifndef INCLUDED_SW_INC_FMTFTN_HXX
+#define INCLUDED_SW_INC_FMTFTN_HXX
#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 11258afeeee4..4132cab0f5a8 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.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 _FMTFTNTX_HXX
-#define _FMTFTNTX_HXX
+#ifndef INCLUDED_SW_INC_FMTFTNTX_HXX
+#define INCLUDED_SW_INC_FMTFTNTX_HXX
#include <svl/eitem.hxx>
#include <hintids.hxx>
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 6ce288ab3820..4a58c1fe4cdc 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.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 _FMTHDFT_HXX
-#define _FMTHDFT_HXX
+#ifndef INCLUDED_SW_INC_FMTHDFT_HXX
+#define INCLUDED_SW_INC_FMTHDFT_HXX
#include <hintids.hxx>
#include <format.hxx>
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 02d0c9b76871..fbdaf2e8552c 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.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 _FMTINFMT_HXX
-#define _FMTINFMT_HXX
+#ifndef INCLUDED_SW_INC_FMTINFMT_HXX
+#define INCLUDED_SW_INC_FMTINFMT_HXX
#include <svl/poolitem.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 088e5bf5dca4..dc0e67ffbddb 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.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 SW_FMTLINE_HXX
-#define SW_FMTLINE_HXX
+#ifndef INCLUDED_SW_INC_FMTLINE_HXX
+#define INCLUDED_SW_INC_FMTLINE_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 7c6eb62232e5..416f1d315b87 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.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 _FMTTSPLT_HXX
-#define _FMTTSPLT_HXX
+#ifndef INCLUDED_SW_INC_FMTLSPLT_HXX
+#define INCLUDED_SW_INC_FMTLSPLT_HXX
#include <svl/eitem.hxx>
#include <hintids.hxx>
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 0a1276d3bd07..5405f2e22ee2 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_FMTMETA_HXX
-#define SW_FMTMETA_HXX
+#ifndef INCLUDED_SW_INC_FMTMETA_HXX
+#define INCLUDED_SW_INC_FMTMETA_HXX
#include <cppuhelper/weakref.hxx>
@@ -216,6 +216,6 @@ public:
} // namespace sw
-#endif // SW_FMTMETA_HXX
+#endif // INCLUDED_SW_INC_FMTMETA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index f86eddb77e51..72e71fefe35c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.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 _FMTORNT_HXX
-#define _FMTORNT_HXX
+#ifndef INCLUDED_SW_INC_FMTORNT_HXX
+#define INCLUDED_SW_INC_FMTORNT_HXX
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index e89f31fa38b6..e6647bcbfa2d 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.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 _FMTPDSC_HXX
-#define _FMTPDSC_HXX
+#ifndef INCLUDED_SW_INC_FMTPDSC_HXX
+#define INCLUDED_SW_INC_FMTPDSC_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index b8ea3333b60d..caa03a62047d 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.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 _FMTRFMRK_HXX
-#define _FMTRFMRK_HXX
+#ifndef INCLUDED_SW_INC_FMTRFMRK_HXX
+#define INCLUDED_SW_INC_FMTRFMRK_HXX
#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 31380bdc24e4..bd0f9cb55fd6 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.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 _FMTROWSPLT_HXX
-#define _FMTROWSPLT_HXX
+#ifndef INCLUDED_SW_INC_FMTROWSPLT_HXX
+#define INCLUDED_SW_INC_FMTROWSPLT_HXX
#include <svl/eitem.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 1371cd9d9f6a..a9010f2e3ed7 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.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 FMTRUBY_HXX
-#define FMTRUBY_HXX
+#ifndef INCLUDED_SW_INC_FMTRUBY_HXX
+#define INCLUDED_SW_INC_FMTRUBY_HXX
#include <svl/poolitem.hxx>
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 26a0e0413eb9..104dc3fd67ea 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.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 _FMTSRND_HXX
-#define _FMTSRND_HXX
+#ifndef INCLUDED_SW_INC_FMTSRND_HXX
+#define INCLUDED_SW_INC_FMTSRND_HXX
#include "swdllapi.h"
#include <hintids.hxx>
diff --git a/sw/inc/fmtsrndenum.hxx b/sw/inc/fmtsrndenum.hxx
index 13661fc956f8..b9e17f5be879 100644
--- a/sw/inc/fmtsrndenum.hxx
+++ b/sw/inc/fmtsrndenum.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 _FMTSRNDENUM_HXX
-#define _FMTSRNDENUM_HXX
+#ifndef INCLUDED_SW_INC_FMTSRNDENUM_HXX
+#define INCLUDED_SW_INC_FMTSRNDENUM_HXX
#include <com/sun/star/text/WrapTextMode.hpp>
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 9c394349ea46..f846fcc84766 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.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 _FMTURL_HXX
-#define _FMTURL_HXX
+#ifndef INCLUDED_SW_INC_FMTURL_HXX
+#define INCLUDED_SW_INC_FMTURL_HXX
#include <svl/poolitem.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 136e6cea600e..557efd6c7437 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.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 _FMTWRAPINFLUENCEONOBJPOS_HXX
-#define _FMTWRAPINFLUENCEONOBJPOS_HXX
+#ifndef INCLUDED_SW_INC_FMTWRAPINFLUENCEONOBJPOS_HXX
+#define INCLUDED_SW_INC_FMTWRAPINFLUENCEONOBJPOS_HXX
#include <hintids.hxx>
#include <format.hxx>
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index d6f801031767..c9efac333085 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.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 _FORMAT_HXX
-#define _FORMAT_HXX
+#ifndef INCLUDED_SW_INC_FORMAT_HXX
+#define INCLUDED_SW_INC_FORMAT_HXX
#include <tools/solar.h>
#include "swdllapi.h"
@@ -337,6 +337,6 @@ inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInPare
#undef inline
-#endif // _FORMAT_HXX
+#endif // INCLUDED_SW_INC_FORMAT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index b5c59d7215d5..977680c03082 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.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 _FRMATR_HXX
-#define _FRMATR_HXX
+#ifndef INCLUDED_SW_INC_FRMATR_HXX
+#define INCLUDED_SW_INC_FRMATR_HXX
#include <hintids.hxx>
#include <format.hxx>
@@ -86,6 +86,6 @@ inline const SvxMacroItem &SwFmt::GetMacro(sal_Bool bInP) const
inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(sal_Bool bInP) const
{ return aSet.GetFrmDir(bInP); }
-#endif //_FRMATR_HXX
+#endif // INCLUDED_SW_INC_FRMATR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index bfe0c2585840..29436cbe7bb9 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.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 _FRMFMT_HXX
-#define _FRMFMT_HXX
+#ifndef INCLUDED_SW_INC_FRMFMT_HXX
+#define INCLUDED_SW_INC_FRMFMT_HXX
#include <com/sun/star/text/PositionLayoutDir.hpp>
#include <cppuhelper/weakref.hxx>
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 3e929eba5723..c1f73536b7a7 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.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 _FTNIDX_HXX
-#define _FTNIDX_HXX
+#ifndef INCLUDED_SW_INC_FTNIDX_HXX
+#define INCLUDED_SW_INC_FTNIDX_HXX
#include <vector>
#include <sal/types.h>
@@ -67,6 +67,6 @@ public:
-#endif // _FTNIDX_HXX
+#endif // INCLUDED_SW_INC_FTNIDX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index aaad290ff3f4..84e4c151b4e5 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.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 _FTNINFO_HXX
-#define _FTNINFO_HXX
+#ifndef INCLUDED_SW_INC_FTNINFO_HXX
+#define INCLUDED_SW_INC_FTNINFO_HXX
#include <rtl/ustring.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index d45412934f0e..16102211d342 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.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 _SWGLOBDOCSH_HXX
-#define _SWGLOBDOCSH_HXX
+#ifndef INCLUDED_SW_INC_GLOBDOC_HXX
+#define INCLUDED_SW_INC_GLOBDOC_HXX
#include <swdll.hxx>
#include "docsh.hxx"
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 7b84836b67d5..9b440269d557 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.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 _GRFATR_HXX
-#define _GRFATR_HXX
+#ifndef INCLUDED_SW_INC_GRFATR_HXX
+#define INCLUDED_SW_INC_GRFATR_HXX
#include <hintids.hxx>
#include <tools/gen.hxx>
@@ -359,6 +359,6 @@ inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const
{ return aSet.GetDrawModeGrf(bInP); }
-#endif // _GRFATR_HXX
+#endif // INCLUDED_SW_INC_GRFATR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 1368c4f17020..b03e0b9c7f38 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.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 _SW_HF_EAT_SPACINGITEM_HXX
-#define _SW_HF_EAT_SPACINGITEM_HXX
+#ifndef INCLUDED_SW_INC_HFSPACINGITEM_HXX
+#define INCLUDED_SW_INC_HFSPACINGITEM_HXX
#include <svl/eitem.hxx>
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index d173fe77a298..ded2c769d725 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.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 _HHCWRP_HXX
-#define _HHCWRP_HXX
+#ifndef INCLUDED_SW_INC_HHCWRP_HXX
+#define INCLUDED_SW_INC_HHCWRP_HXX
#include <editeng/hangulhanja.hxx>
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 8d5feceeef67..00d20c440ea9 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.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 _HINTIDS_HXX
-#define _HINTIDS_HXX
+#ifndef INCLUDED_SW_INC_HINTIDS_HXX
+#define INCLUDED_SW_INC_HINTIDS_HXX
#include <tools/solar.h>
#include <sal/types.h>
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 9907d6044932..a2a268fc9530 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.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 _HINTS_HXX
-#define _HINTS_HXX
+#ifndef INCLUDED_SW_INC_HINTS_HXX
+#define INCLUDED_SW_INC_HINTS_HXX
#include <swatrset.hxx>
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 82625d521b17..ce63e6b86c2b 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HTMLTBL_HXX
-#define _HTMLTBL_HXX
+#ifndef INCLUDED_SW_INC_HTMLTBL_HXX
+#define INCLUDED_SW_INC_HTMLTBL_HXX
#include <vcl/timer.hxx>
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index e59d0d843b6d..65d40c5e56f9 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.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 SW_INDEX_HXX
-#define SW_INDEX_HXX
+#ifndef INCLUDED_SW_INC_INDEX_HXX
+#define INCLUDED_SW_INC_INDEX_HXX
#include <limits.h>
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index fdeb4fb464ee..16cefd7f7669 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.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 _INIT_HXX
-#define _INIT_HXX
+#ifndef INCLUDED_SW_INC_INIT_HXX
+#define INCLUDED_SW_INC_INIT_HXX
#include "sal/config.h"
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index c77ee2dacacf..0be5a59cd24b 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IODETECT_HXX_
-#define _IODETECT_HXX_
+#ifndef INCLUDED_SW_INC_IODETECT_HXX
+#define INCLUDED_SW_INC_IODETECT_HXX
#include <osl/endian.h>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index 7f9c7f22fefc..add8a10e3100 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.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 _ISTYLEACCESS_HXX
-#define _ISTYLEACCESS_HXX
+#ifndef INCLUDED_SW_INC_ISTYLEACCESS_HXX
+#define INCLUDED_SW_INC_ISTYLEACCESS_HXX
#include <vector>
#include <svl/stylepool.hxx>
@@ -56,6 +56,6 @@ public:
virtual void clearCaches() = 0;
};
-#endif // _ISTYLEACCESS_HXX
+#endif // INCLUDED_SW_INC_ISTYLEACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index 00165219f7eb..c21ed1d500cb 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.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 _ITABENUM_HXX
-#define _ITABENUM_HXX
+#ifndef INCLUDED_SW_INC_ITABENUM_HXX
+#define INCLUDED_SW_INC_ITABENUM_HXX
#include <tools/solar.h>
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 2557ada92aa8..4cae87215b8f 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.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 SW_LINEINFO_HXX
-#define SW_LINEINFO_HXX
+#ifndef INCLUDED_SW_INC_LINEINFO_HXX
+#define INCLUDED_SW_INC_LINEINFO_HXX
#include "calbck.hxx"
#include <editeng/numitem.hxx>
diff --git a/sw/inc/linkenum.hxx b/sw/inc/linkenum.hxx
index 9d0b4f6c7e54..dcf4e9841db3 100644
--- a/sw/inc/linkenum.hxx
+++ b/sw/inc/linkenum.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 _LINKENUM_HXX
-#define _LINKENUM_HXX
+#ifndef INCLUDED_SW_INC_LINKENUM_HXX
+#define INCLUDED_SW_INC_LINKENUM_HXX
enum UpdateLinks
{
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 1d85296d28a7..19662538e7ba 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef LIST_HXX_INCLUDED
-#define LIST_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_LIST_HXX
+#define INCLUDED_SW_INC_LIST_HXX
#include <rtl/ustring.hxx>
@@ -59,6 +59,6 @@ class SwList
SwListImpl* mpListImpl;
};
-#endif // LIST_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_LIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/listfunc.hxx b/sw/inc/listfunc.hxx
index ac64b0229227..4057e193f669 100644
--- a/sw/inc/listfunc.hxx
+++ b/sw/inc/listfunc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef LISTFUNC_HXX_INCLUDED
-#define LISTFUNC_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_LISTFUNC_HXX
+#define INCLUDED_SW_INC_LISTFUNC_HXX
class SwDoc;
@@ -27,6 +27,6 @@ namespace listfunc
const OUString CreateUniqueListId( const SwDoc& rDoc );
}
-#endif // LISTFUNC_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_LISTFUNC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index a8d38c2d13c2..e3319e5175f8 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.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 _MDIEXP_HXX
-#define _MDIEXP_HXX
+#ifndef INCLUDED_SW_INC_MDIEXP_HXX
+#define INCLUDED_SW_INC_MDIEXP_HXX
#include <rtl/ustring.hxx>
#include <tools/solar.h>
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 75d8a2aca69f..2f9c5d4d0ed1 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.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 _MODOPT_HXX
-#define _MODOPT_HXX
+#ifndef INCLUDED_SW_INC_MODCFG_HXX
+#define INCLUDED_SW_INC_MODCFG_HXX
#include <boost/ptr_container/ptr_vector.hpp>
#include <tools/wintypes.hxx>
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index a6a9d96c5976..b22262bad05a 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _MODELTOVIEWHELPER_HXX
-#define _MODELTOVIEWHELPER_HXX
+#ifndef INCLUDED_SW_INC_MODELTOVIEWHELPER_HXX
+#define INCLUDED_SW_INC_MODELTOVIEWHELPER_HXX
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index ca02795d7694..4e8501f01e52 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_NDARR_HXX
-#define SW_NDARR_HXX
+#ifndef INCLUDED_SW_INC_NDARR_HXX
+#define INCLUDED_SW_INC_NDARR_HXX
#include <vector>
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d073fb17a8a4..f886b2f4f79e 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef NDGRF_HXX
-#define NDGRF_HXX
+#ifndef INCLUDED_SW_INC_NDGRF_HXX
+#define INCLUDED_SW_INC_NDGRF_HXX
#include <sfx2/lnkbase.hxx>
#include <svtools/grfmgr.hxx>
#include <ndnotxt.hxx>
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 91488a80d110..c08ebbb81cc2 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.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 _NDHINTS_HXX
-#define _NDHINTS_HXX
+#ifndef INCLUDED_SW_INC_NDHINTS_HXX
+#define INCLUDED_SW_INC_NDHINTS_HXX
#include <tools/mempool.hxx>
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 9141c597ce6f..7e8a2f3434b4 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.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 SW_NDINDEX_HXX
-#define SW_NDINDEX_HXX
+#ifndef INCLUDED_SW_INC_NDINDEX_HXX
+#define INCLUDED_SW_INC_NDINDEX_HXX
#include <limits.h>
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index f9d65c55dfd4..015a1a78266b 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.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 _NDNOTXT_HXX
-#define _NDNOTXT_HXX
+#ifndef INCLUDED_SW_INC_NDNOTXT_HXX
+#define INCLUDED_SW_INC_NDNOTXT_HXX
#include "node.hxx"
@@ -100,6 +100,6 @@ inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0;
}
-#endif // _NDNOTXT_HXX
+#endif // INCLUDED_SW_INC_NDNOTXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 650b1b8d2cb9..6f027279f426 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.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 NDOLE_HXX
-#define NDOLE_HXX
+#ifndef INCLUDED_SW_INC_NDOLE_HXX
+#define INCLUDED_SW_INC_NDOLE_HXX
#include <ndnotxt.hxx>
@@ -153,6 +153,6 @@ inline const SwOLENode *SwNode::GetOLENode() const
return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
}
-#endif // _NDOLE_HXX
+#endif // _ INCLUDED_SW_INC_NDOLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 1e4c26eb3253..49b66e2c0e3f 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.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 SW_NDTXT_HXX
-#define SW_NDTXT_HXX
+#ifndef INCLUDED_SW_INC_NDTXT_HXX
+#define INCLUDED_SW_INC_NDTXT_HXX
#include <cppuhelper/weakref.hxx>
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index f06b2921266e..9ea932588a8b 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _NDTYP_HXX
-#define _NDTYP_HXX
+#ifndef INCLUDED_SW_INC_NDTYP_HXX
+#define INCLUDED_SW_INC_NDTYP_HXX
#include <tools/solar.h>
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d0b01c51584b..94908cc6c8a3 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_NODE_HXX
-#define SW_NODE_HXX
+#ifndef INCLUDED_SW_INC_NODE_HXX
+#define INCLUDED_SW_INC_NODE_HXX
#include <vector>
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 7503e17453c6..95dfb330f332 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.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 _NUMRULE_HXX
-#define _NUMRULE_HXX
+#ifndef INCLUDED_SW_INC_NUMRULE_HXX
+#define INCLUDED_SW_INC_NUMRULE_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -317,6 +317,6 @@ namespace numfunc
SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode();
}
-#endif // _NUMRULE_HXX
+#endif // INCLUDED_SW_INC_NUMRULE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index e1ab6f7290ef..4fa0449cc98b 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.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 PAGEDESC_HXX
-#define PAGEDESC_HXX
+#ifndef INCLUDED_SW_INC_PAGEDESC_HXX
+#define INCLUDED_SW_INC_PAGEDESC_HXX
#include <tools/fract.hxx>
#include <tools/color.hxx>
@@ -335,6 +335,6 @@ public:
};
-#endif //PAGEDESC_HXX
+#endif // INCLUDED_SW_INC_PAGEDESC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 98b15667a18e..4b9e924ea9bb 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PAGEPREVIEWLAYOUT_HXX
-#define _PAGEPREVIEWLAYOUT_HXX
+#ifndef INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX
+#define INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX
// template class <std::vector>
#include <vector>
@@ -579,6 +579,6 @@ public:
sal_uInt16 GetNumberOfPreviewPages() { return sal::static_int_cast< sal_uInt16 >(maPreviewPages.size()); }
};
-#endif // _PAGEPREVIEWLAYOUT_HXX
+#endif // INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index f48dff8e85be..15e54c0d8b8b 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.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 _PAM_HXX
-#define _PAM_HXX
+#ifndef INCLUDED_SW_INC_PAM_HXX
+#define INCLUDED_SW_INC_PAM_HXX
#include <stddef.h>
#include <sal/types.h>
@@ -307,6 +307,6 @@ bool CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, bool bChkSection )
bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove );
-#endif // _PAM_HXX
+#endif // INCLUDED_SW_INC_PAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 56093c22bd70..ef640040ab0d 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.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 _PARATR_HXX
-#define _PARATR_HXX
+#ifndef INCLUDED_SW_INC_PARATR_HXX
+#define INCLUDED_SW_INC_PARATR_HXX
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx
index a0a4a9cd3eb1..370367ea6ff9 100644
--- a/sw/inc/pausethreadstarting.hxx
+++ b/sw/inc/pausethreadstarting.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 _PAUSETHREADSTARTING_HXX
-#define _PAUSETHREADSTARTING_HXX
+#ifndef INCLUDED_SW_INC_PAUSETHREADSTARTING_HXX
+#define INCLUDED_SW_INC_PAUSETHREADSTARTING_HXX
/** Helper class to pause starting of threads during existence of an instance
of this class
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 842e676a73c2..75f4c8d61825 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.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 _POOLFMT_HXX
-#define _POOLFMT_HXX
+#ifndef INCLUDED_SW_INC_POOLFMT_HXX
+#define INCLUDED_SW_INC_POOLFMT_HXX
#include <limits.h>
#include <tools/solar.h>
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 7648015fe5d8..883fab8b7208 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.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 _POSTITHELPER_HXX
-#define _POSTITHELPER_HXX
+#ifndef INCLUDED_SW_INC_POSTITHELPER_HXX
+#define INCLUDED_SW_INC_POSTITHELPER_HXX
#include <swrect.hxx>
#include <fmtfld.hxx>
@@ -125,6 +125,6 @@ class SwAnnotationItem: public SwSidebarItem
SwPostItBits aBits);
};
-#endif // _POSTITHELPER_HXX
+#endif // INCLUDED_SW_INC_POSTITHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index e111955e1e0b..b68860858d43 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.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 SW_PRINTDATA_HXX
-#define SW_PRINTDATA_HXX
+#ifndef INCLUDED_SW_INC_PRINTDATA_HXX
+#define INCLUDED_SW_INC_PRINTDATA_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -314,6 +314,6 @@ void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb);
} ///< namespace sw
-#endif // SW_PRINTDATA_HXX
+#endif // INCLUDED_SW_INC_PRINTDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 64dc9cd4c3c6..22acab7d2c46 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.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 _PRTOPT_HXX
-#define _PRTOPT_HXX
+#ifndef INCLUDED_SW_INC_PRTOPT_HXX
+#define INCLUDED_SW_INC_PRTOPT_HXX
#include <unotools/configitem.hxx>
#include <printdata.hxx>
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index 65d0adf41c13..96ee15e7002b 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PVPRTDAT_HXX
-#define _PVPRTDAT_HXX
+#ifndef INCLUDED_SW_INC_PVPRTDAT_HXX
+#define INCLUDED_SW_INC_PVPRTDAT_HXX
#include <tools/solar.h>
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 6a2750b93ffc..b49b6d964cdd 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.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 _REDLINE_HXX
-#define _REDLINE_HXX
+#ifndef INCLUDED_SW_INC_REDLINE_HXX
+#define INCLUDED_SW_INC_REDLINE_HXX
#include <tools/datetime.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 620190782307..6fded12d815b 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.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 SW_REFFLD_HXX
-#define SW_REFFLD_HXX
+#ifndef INCLUDED_SW_INC_REFFLD_HXX
+#define INCLUDED_SW_INC_REFFLD_HXX
#include <fldbas.hxx>
@@ -145,6 +145,6 @@ public:
};
-#endif /// SW_REFFLD_HXX
+#endif /// INCLUDED_SW_INC_REFFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index efef1a45b2be..70c85d1e8ae1 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.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 _RING_HXX
-#define _RING_HXX
+#ifndef INCLUDED_SW_INC_RING_HXX
+#define INCLUDED_SW_INC_RING_HXX
#include <swdllapi.h>
#include <swtypes.hxx>
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index ec834f9f4a70..5ad8525725e2 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.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 RUBYLIST_HXX
-#define RUBYLIST_HXX
+#ifndef INCLUDED_SW_INC_RUBYLIST_HXX
+#define INCLUDED_SW_INC_RUBYLIST_HXX
#include <swtypes.hxx>
#include <fmtruby.hxx>
@@ -42,6 +42,6 @@ public:
class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {};
-#endif //_RUBYLIST_HXX
+#endif //_ INCLUDED_SW_INC_RUBYLIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 8f3005e0eb0f..92d011385f6f 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SECTION_HXX
-#define SECTION_HXX
+#ifndef INCLUDED_SW_INC_SECTION_HXX
+#define INCLUDED_SW_INC_SECTION_HXX
#include <boost/utility.hpp>
@@ -387,6 +387,6 @@ inline SwSection* SwSectionFmt::GetParentSection() const
}
-#endif /* _SECTION_HXX */
+#endif /* _ INCLUDED_SW_INC_SECTION_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/shellid.hxx b/sw/inc/shellid.hxx
index 4b67afbc0042..33ff3581d847 100644
--- a/sw/inc/shellid.hxx
+++ b/sw/inc/shellid.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 _SHELLID_HXX
-#define _SHELLID_HXX
+#ifndef INCLUDED_SW_INC_SHELLID_HXX
+#define INCLUDED_SW_INC_SHELLID_HXX
#include <sfx2/shell.hxx>
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 3e0d0f597a20..1acbf88320e4 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.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 SW_SHELLIO_HXX
-#define SW_SHELLIO_HXX
+#ifndef INCLUDED_SW_INC_SHELLIO_HXX
+#define INCLUDED_SW_INC_SHELLIO_HXX
#include <memory>
#include <boost/utility.hpp>
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 0538045b6ebe..df10cbd05154 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.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 _SHELLRES_HXX
-#define _SHELLRES_HXX
+#ifndef INCLUDED_SW_INC_SHELLRES_HXX
+#define INCLUDED_SW_INC_SHELLRES_HXX
#include <swdllapi.h>
#include <rtl/ustring.hxx>
@@ -101,6 +101,6 @@ inline const std::vector<OUString>& ShellResource::GetAutoFmtNameLst() const
return *pAutoFmtNameLst;
}
-#endif //_SHELLRES_HXX
+#endif // INCLUDED_SW_INC_SHELLRES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index f8a3bf1b1fec..7703e5300616 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.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 _SORTOPT_HXX
-#define _SORTOPT_HXX
+#ifndef INCLUDED_SW_INC_SORTOPT_HXX
+#define INCLUDED_SW_INC_SORTOPT_HXX
#include <rtl/ustring.hxx>
#include "swdllapi.h"
@@ -55,6 +55,6 @@ struct SW_DLLPUBLIC SwSortOptions
bool bIgnoreCase;
};
-#endif // _SORTOPT_HXX
+#endif // INCLUDED_SW_INC_SORTOPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 16e5c8cae73e..45fc34d41bf8 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.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 _SPLARGS_HXX
-#define _SPLARGS_HXX
+#ifndef INCLUDED_SW_INC_SPLARGS_HXX
+#define INCLUDED_SW_INC_SPLARGS_HXX
#include <i18nlangtag/lang.h>
#include <tools/solar.h>
diff --git a/sw/inc/sw_primitivetypes2d.hxx b/sw/inc/sw_primitivetypes2d.hxx
index ba3ce2ca3296..d9f75208f3c6 100644
--- a/sw/inc/sw_primitivetypes2d.hxx
+++ b/sw/inc/sw_primitivetypes2d.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_PRIMITIVETYPES2D_HXX
-#define INCLUDED_SW_PRIMITIVETYPES2D_HXX
+#ifndef INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX
+#define INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
@@ -30,6 +30,6 @@
//////////////////////////////////////////////////////////////////////////////
-#endif // INCLUDED_SW_PRIMITIVETYPES2D_HXX
+#endif // INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index e1f5d7c60aea..d7b81e810557 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.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 _SW_ABSTDLG_HXX
-#define _SW_ABSTDLG_HXX
+#ifndef INCLUDED_SW_INC_SWABSTDLG_HXX
+#define INCLUDED_SW_INC_SWABSTDLG_HXX
#include <rtl/ustring.hxx>
#include <tools/solar.h>
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index 0c26eb08591e..95a7c46e3330 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.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 _SWACORR_HXX
-#define _SWACORR_HXX
+#ifndef INCLUDED_SW_INC_SWACORR_HXX
+#define INCLUDED_SW_INC_SWACORR_HXX
#include <editeng/svxacorr.hxx>
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index e713d4c3a397..4e20e75ba393 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.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 _SWATRSET_HXX
-#define _SWATRSET_HXX
+#ifndef INCLUDED_SW_INC_SWATRSET_HXX
+#define INCLUDED_SW_INC_SWATRSET_HXX
#include <tools/solar.h>
#include <tools/mempool.hxx>
#include <svl/itemset.hxx>
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index df055161afad..3d35fcae0cd7 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.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 _SWBASLNK_HXX
-#define _SWBASLNK_HXX
+#ifndef INCLUDED_SW_INC_SWBASLNK_HXX
+#define INCLUDED_SW_INC_SWBASLNK_HXX
#include <sfx2/lnkbase.hxx>
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index d98d0ff3a71e..307c53c90a62 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWCALWRP_HXX
-#define _SWCALWRP_HXX
+#ifndef INCLUDED_SW_INC_SWCALWRP_HXX
+#define INCLUDED_SW_INC_SWCALWRP_HXX
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index 3b8a003da397..b80b231c3ef5 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.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 _SWCLI_HXX
-#define _SWCLI_HXX
+#ifndef INCLUDED_SW_INC_SWCLI_HXX
+#define INCLUDED_SW_INC_SWCLI_HXX
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <svtools/embedhlp.hxx>
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 6649063481a0..0f5cd54193e8 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.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 SW_SWCOMMANDS_HRC
-#define SW_SWCOMMANDS_HRC
+#ifndef INCLUDED_SW_INC_SWCOMMANDS_H
+#define INCLUDED_SW_INC_SWCOMMANDS_H
#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView"
#define CMD_FN_FRAME_ALIGN_VERT_BOTTOM ".uno:AlignBottom"
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 7fa39a8ca307..46278503b16e 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.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 _SWCRSR_HXX
-#define _SWCRSR_HXX
+#ifndef INCLUDED_SW_INC_SWCRSR_HXX
+#define INCLUDED_SW_INC_SWCRSR_HXX
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 2c908461f7d2..7d73861ce6cd 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.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 _SWDBDATA_HXX
-#define _SWDBDATA_HXX
+#ifndef INCLUDED_SW_INC_SWDBDATA_HXX
+#define INCLUDED_SW_INC_SWDBDATA_HXX
#include <tools/solar.h>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index da84a9f39d41..69fa86eedbc1 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.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 _SWDBTOOLSCLIENT_HXX
-#define _SWDBTOOLSCLIENT_HXX
+#ifndef INCLUDED_SW_INC_SWDBTOOLSCLIENT_HXX
+#define INCLUDED_SW_INC_SWDBTOOLSCLIENT_HXX
#include <connectivity/virtualdbtools.hxx>
#include <osl/mutex.hxx>
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index b5cba49e9b54..e88543686da2 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.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 _SWDDETBL_HXX
-#define _SWDDETBL_HXX
+#ifndef INCLUDED_SW_INC_SWDDETBL_HXX
+#define INCLUDED_SW_INC_SWDDETBL_HXX
#include "swtable.hxx"
diff --git a/sw/inc/swddllapi.h b/sw/inc/swddllapi.h
index 085cda5b59f6..d2b9f0dff523 100644
--- a/sw/inc/swddllapi.h
+++ b/sw/inc/swddllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SWDDLLAPI_H
-#define INCLUDED_SWDDLLAPI_H
+#ifndef INCLUDED_SW_INC_SWDDLLAPI_H
+#define INCLUDED_SW_INC_SWDDLLAPI_H
#include "sal/types.h"
@@ -29,6 +29,6 @@
#endif
#define SWD_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_SWDDLLAPI_H */
+#endif // INCLUDED_SW_INC_SWDDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index 16e242f8fd3a..707a2560a212 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.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 SW_SWDLL_HXX
-#define SW_SWDLL_HXX
+#ifndef INCLUDED_SW_INC_SWDLL_HXX
+#define INCLUDED_SW_INC_SWDLL_HXX
#include <sfx2/sfxdefs.hxx>
#include <sfx2/module.hxx>
diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h
index 5ce021e7a2ab..f719ff7fcbd7 100644
--- a/sw/inc/swdllapi.h
+++ b/sw/inc/swdllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SWDLLAPI_H
-#define INCLUDED_SWDLLAPI_H
+#ifndef INCLUDED_SW_INC_SWDLLAPI_H
+#define INCLUDED_SW_INC_SWDLLAPI_H
#include "sal/types.h"
@@ -29,6 +29,6 @@
#endif
#define SW_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_SWDLLAPI_H */
+#endif // INCLUDED_SW_INC_SWDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index f621f53e2b1e..5bb007e8fe8f 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWSWERROR_H
-#define _SWSWERROR_H
+#ifndef INCLUDED_SW_INC_SWERROR_H
+#define INCLUDED_SW_INC_SWERROR_H
#include <tools/errcode.hxx>
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 1975969d6d89..8bb787ef5ca3 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWEVENT_HXX
-#define _SWEVENT_HXX
+#ifndef INCLUDED_SW_INC_SWEVENT_HXX
+#define INCLUDED_SW_INC_SWEVENT_HXX
#include <tools/solar.h>
#include <sfx2/sfx.hrc>
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 8a21083c1d63..4a611d2218a0 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.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 _SWFTLOPT_HXX
-#define _SWFTLOPT_HXX
+#ifndef INCLUDED_SW_INC_SWFLTOPT_HXX
+#define INCLUDED_SW_INC_SWFLTOPT_HXX
#include <unotools/configitem.hxx>
diff --git a/sw/inc/swhints.hxx b/sw/inc/swhints.hxx
index 185d8258f85d..4c18982c8689 100644
--- a/sw/inc/swhints.hxx
+++ b/sw/inc/swhints.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 SW_HINTS_HXX
-#define SW_HINTS_HXX
+#ifndef INCLUDED_SW_INC_SWHINTS_HXX
+#define INCLUDED_SW_INC_SWHINTS_HXX
#include <svl/smplhint.hxx>
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
index 190e14e823ac..7d2e27ae71a2 100644
--- a/sw/inc/switerator.hxx
+++ b/sw/inc/switerator.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 _SWITERATOR_HXX
-#define _SWITERATOR_HXX
+#ifndef INCLUDED_SW_INC_SWITERATOR_HXX
+#define INCLUDED_SW_INC_SWITERATOR_HXX
#include <calbck.hxx>
#include <sal/log.hxx>
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 41e9cd9dc346..62e8ed697407 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.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 SWMODULE_HXX
-#define SWMODULE_HXX
+#ifndef INCLUDED_SW_INC_SWMODULE_HXX
+#define INCLUDED_SW_INC_SWMODULE_HXX
#include <tools/fldunit.hxx>
#include <svl/lstner.hxx>
#include <unotools/options.hxx>
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 67ee8781b0a8..6ac301ca5391 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.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 _SWRECT_HXX
-#define _SWRECT_HXX
+#ifndef INCLUDED_SW_INC_SWRECT_HXX
+#define INCLUDED_SW_INC_SWRECT_HXX
#include <ostream>
@@ -356,6 +356,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
<< "@(" << rectangle.Pos() << ")";
}
-#endif //_SWRECT_HXX
+#endif // INCLUDED_SW_INC_SWRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 2f0b7d8b3021..5602c127637e 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.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 _SWREGION_HXX
-#define _SWREGION_HXX
+#ifndef INCLUDED_SW_INC_SWREGION_HXX
+#define INCLUDED_SW_INC_SWREGION_HXX
#include <vector>
@@ -47,6 +47,6 @@ public:
inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; }
};
-#endif //_SWREGION_HXX
+#endif // INCLUDED_SW_INC_SWREGION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index daff93c4e5ca..6822991b0ba1 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWSCANNER_HXX
-#define _SWSCANNER_HXX
+#ifndef INCLUDED_SW_INC_SWSCANNER_HXX
+#define INCLUDED_SW_INC_SWSCANNER_HXX
#include <i18nlangtag/lang.h>
#include <modeltoviewhelper.hxx>
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index d57870d62bd5..48be55377544 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.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 _SWSERV_HXX
-#define _SWSERV_HXX
+#ifndef INCLUDED_SW_INC_SWSERV_HXX
+#define INCLUDED_SW_INC_SWSERV_HXX
#include <sfx2/linksrc.hxx>
#include <IMark.hxx>
@@ -81,6 +81,6 @@ public:
SV_DECL_REF( SwServerObject )
#endif
-#endif // _SWSERV_HXX
+#endif // INCLUDED_SW_INC_SWSERV_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swstyle.h b/sw/inc/swstyle.h
index 8d515bb65be6..59e37e95a3f9 100644
--- a/sw/inc/swstyle.h
+++ b/sw/inc/swstyle.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 _SWSTYLE_H
-#define _SWSTYLE_H
+#ifndef INCLUDED_SW_INC_SWSTYLE_H
+#define INCLUDED_SW_INC_SWSTYLE_H
#define SWSTYLEBIT_TEXT 0x0001
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 83c153bc4de3..a4e2dbed8638 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.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 _SWTABLE_HXX
-#define _SWTABLE_HXX
+#ifndef INCLUDED_SW_INC_SWTABLE_HXX
+#define INCLUDED_SW_INC_SWTABLE_HXX
#include <tools/mempool.hxx>
#include <tools/ref.hxx>
#include <tblenum.hxx>
@@ -496,6 +496,6 @@ public:
const SwTableBox * getTableBox() const;
};
-#endif //_SWTABLE_HXX
+#endif // INCLUDED_SW_INC_SWTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 26ea0d875bb7..30b878aff0d3 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.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 _SWTBLFMT_HXX
-#define _SWTBLFMT_HXX
+#ifndef INCLUDED_SW_INC_SWTBLFMT_HXX
+#define INCLUDED_SW_INC_SWTBLFMT_HXX
#include <frmfmt.hxx>
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 07b22f921381..32ec4769012f 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.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 _SWTYPES_HXX
-#define _SWTYPES_HXX
+#ifndef INCLUDED_SW_INC_SWTYPES_HXX
+#define INCLUDED_SW_INC_SWTYPES_HXX
#include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <SwGetPoolIdFromName.hxx>
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 1a19e4a4ba38..ffaa1c2e4ed4 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.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 SWUNDO_HXX
-#define SWUNDO_HXX
+#ifndef INCLUDED_SW_INC_SWUNDO_HXX
+#define INCLUDED_SW_INC_SWUNDO_HXX
#include <vector>
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index abd71e31b75e..f942b1468a23 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.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 _SWUNOHELPER_HXX
-#define _SWUNOHELPER_HXX
+#ifndef INCLUDED_SW_INC_SWUNOHELPER_HXX
+#define INCLUDED_SW_INC_SWUNOHELPER_HXX
#include <tools/solar.h>
#include <sal/types.h>
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 9e755ad3dc52..875ca28706fc 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.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 _SWURL_HXX
-#define _SWURL_HXX
+#ifndef INCLUDED_SW_INC_SWURL_HXX
+#define INCLUDED_SW_INC_SWURL_HXX
#include <rtl/ustring.hxx>
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index 58d609751855..2b6b3abdc795 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.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 _SWWAIT_HXX
-#define _SWWAIT_HXX
+#ifndef INCLUDED_SW_INC_SWWAIT_HXX
+#define INCLUDED_SW_INC_SWWAIT_HXX
#include <tools/solar.h>
#include "swdllapi.h"
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 2ce41e028c65..270a834d6673 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.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 _TABCOL_HXX
-#define _TABCOL_HXX
+#ifndef INCLUDED_SW_INC_TABCOL_HXX
+#define INCLUDED_SW_INC_TABCOL_HXX
#include <tools/solar.h>
@@ -88,6 +88,6 @@ public:
void SetLastRowAllowedToChange( bool bNew ) { bLastRowAllowedToChange = bNew; }
};
-#endif //_TABCOL_HXX
+#endif // INCLUDED_SW_INC_TABCOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index a5444a9f2dff..edf87d1cf53a 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.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 SW_TBLAFMT_HXX
-#define SW_TBLAFMT_HXX
+#ifndef INCLUDED_SW_INC_TBLAFMT_HXX
+#define INCLUDED_SW_INC_TBLAFMT_HXX
/*************************************************************************
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index ed41c0a5bbc0..2d9e6064528d 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.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 _TBLENUM_HXX
-#define _TBLENUM_HXX
+#ifndef INCLUDED_SW_INC_TBLENUM_HXX
+#define INCLUDED_SW_INC_TBLENUM_HXX
// For changing table columns/rows widths/heights.
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index cab5999969c8..9c6cda63ddc1 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.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 _TBLSEL_HXX
-#define _TBLSEL_HXX
+#ifndef INCLUDED_SW_INC_TBLSEL_HXX
+#define INCLUDED_SW_INC_TBLSEL_HXX
#include <swtable.hxx>
#include <swrect.hxx>
@@ -224,6 +224,6 @@ SW_DLLPUBLIC void ForEach_FndLineCopyCol(SwTableLines& rLines, _FndPara* pFndPar
-#endif // _TBLSEL_HXX
+#endif // INCLUDED_SW_INC_TBLSEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 24b3a5f3ffae..1e7b8a371102 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.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 SW_TGRDITEM_HXX
-#define SW_TGRDITEM_HXX
+#ifndef INCLUDED_SW_INC_TGRDITEM_HXX
+#define INCLUDED_SW_INC_TGRDITEM_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 93c6200b31c4..7ffcfaee2243 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.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 SW_TOX_HXX
-#define SW_TOX_HXX
+#ifndef INCLUDED_SW_INC_TOX_HXX
+#define INCLUDED_SW_INC_TOX_HXX
#include <cppuhelper/weakref.hxx>
@@ -761,6 +761,6 @@ inline void SwTOXBase::SetOptions(sal_uInt16 nOpt)
}
-#endif // SW_TOX_HXX
+#endif // INCLUDED_SW_INC_TOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index 550f0ac79fe3..7de90e2977c7 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.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 _TOXE_HXX
-#define _TOXE_HXX
+#ifndef INCLUDED_SW_INC_TOXE_HXX
+#define INCLUDED_SW_INC_TOXE_HXX
enum SwTOXSearch
{
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 64b9d1dbfe07..4f50f3273689 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TOXWRAP_HXX
-#define _TOXWRAP_HXX
+#ifndef INCLUDED_SW_INC_TOXWRAP_HXX
+#define INCLUDED_SW_INC_TOXWRAP_HXX
#include <tools/solar.h>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index eeba841afd45..2b14a2ebddbd 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.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 _TXATBASE_HXX
-#define _TXATBASE_HXX
+#ifndef INCLUDED_SW_INC_TXATBASE_HXX
+#define INCLUDED_SW_INC_TXATBASE_HXX
#include <tools/solar.h>
#include <svl/poolitem.hxx>
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index b583f7334bd8..fd75e8834558 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.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 _TXATRITR_HXX
-#define _TXATRITR_HXX
+#ifndef INCLUDED_SW_INC_TXATRITR_HXX
+#define INCLUDED_SW_INC_TXATRITR_HXX
#include <tools/solar.h>
#include <sal/types.h>
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index bbee2716580f..9539397b35c2 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.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 _TXTATR_HXX
-#define _TXTATR_HXX
+#ifndef INCLUDED_SW_INC_TXTATR_HXX
+#define INCLUDED_SW_INC_TXTATR_HXX
#include <txatbase.hxx>
#include <calbck.hxx>
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index 262e200d9262..70d8edfee672 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.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 _TXTFLCNT_HXX
-#define _TXTFLCNT_HXX
+#ifndef INCLUDED_SW_INC_TXTFLCNT_HXX
+#define INCLUDED_SW_INC_TXTFLCNT_HXX
#include <txatbase.hxx>
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 33ce24e5c9fc..cffdd1f2a00b 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.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 _TXTFLD_HXX
-#define _TXTFLD_HXX
+#ifndef INCLUDED_SW_INC_TXTFLD_HXX
+#define INCLUDED_SW_INC_TXTFLD_HXX
#include <txatbase.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 8a4899f21bf4..35eb042d6af6 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.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 _TXTFTN_HXX
-#define _TXTFTN_HXX
+#ifndef INCLUDED_SW_INC_TXTFTN_HXX
+#define INCLUDED_SW_INC_TXTFTN_HXX
#include <txatbase.hxx>
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index fe54103424a0..44cc5605594e 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.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 _TXTINET_HXX
-#define _TXTINET_HXX
+#ifndef INCLUDED_SW_INC_TXTINET_HXX
+#define INCLUDED_SW_INC_TXTINET_HXX
#include <txatbase.hxx>
#include <txtatr.hxx>
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index c91bda483fd1..56e757ffde81 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.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 _TXTRFMRK_HXX
-#define _TXTRFMRK_HXX
+#ifndef INCLUDED_SW_INC_TXTRFMRK_HXX
+#define INCLUDED_SW_INC_TXTRFMRK_HXX
#include <txatbase.hxx>
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 5969f339a184..313f734ecbf3 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.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 _TXTTXMRK_HXX
-#define _TXTTXMRK_HXX
+#ifndef INCLUDED_SW_INC_TXTTXMRK_HXX
+#define INCLUDED_SW_INC_TXTTXMRK_HXX
#include <txatbase.hxx>
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 3c44d5b9911a..c40d229a8351 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.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 SW_UNDOBJ_HXX
-#define SW_UNDOBJ_HXX
+#ifndef INCLUDED_SW_INC_UNDOBJ_HXX
+#define INCLUDED_SW_INC_UNDOBJ_HXX
#include <vector>
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 3dfe62f48375..ff5d831bc5f1 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.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 SW_UNOBASECLASS_HXX
-#define SW_UNOBASECLASS_HXX
+#ifndef INCLUDED_SW_INC_UNOBASECLASS_HXX
+#define INCLUDED_SW_INC_UNOBASECLASS_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -151,6 +151,6 @@ namespace sw {
} // namespace sw
-#endif // SW_UNOBASECLASS_HXX
+#endif // INCLUDED_SW_INC_UNOBASECLASS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index f5753136ec8c..753035d33f00 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.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 _UNOCHART_HXX
-#define _UNOCHART_HXX
+#ifndef INCLUDED_SW_INC_UNOCHART_HXX
+#define INCLUDED_SW_INC_UNOCHART_HXX
#include <map>
#include <set>
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 928466513fa6..b3e77dc00872 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.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 _UNOCOLL_HXX
-#define _UNOCOLL_HXX
+#ifndef INCLUDED_SW_INC_UNOCOLL_HXX
+#define INCLUDED_SW_INC_UNOCOLL_HXX
#include <tools/solar.h>
#include <flyenum.hxx>
#include <vcl/timer.hxx>
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 98b87915229f..ecb435d8e1b7 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.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 _UNOCRSR_HXX
-#define _UNOCRSR_HXX
+#ifndef INCLUDED_SW_INC_UNOCRSR_HXX
+#define INCLUDED_SW_INC_UNOCRSR_HXX
#include <swcrsr.hxx>
#include <calbck.hxx>
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index bf1fa8849841..a19effc78793 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.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 SW_UNOCRSRHELPER_HXX
-#define SW_UNOCRSRHELPER_HXX
+#ifndef INCLUDED_SW_INC_UNOCRSRHELPER_HXX
+#define INCLUDED_SW_INC_UNOCRSRHELPER_HXX
#include <map>
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index a505e16a0645..3de1251d3002 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.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 _UNODRAW_HXX
-#define _UNODRAW_HXX
+#ifndef INCLUDED_SW_INC_UNODRAW_HXX
+#define INCLUDED_SW_INC_UNODRAW_HXX
#include <svx/fmdpage.hxx>
#include <calbck.hxx>
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index c182dc3b958c..832f075b27a6 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOFIELDCOLL_HXX
-#define SW_UNOFIELDCOLL_HXX
+#ifndef INCLUDED_SW_INC_UNOFIELDCOLL_HXX
+#define INCLUDED_SW_INC_UNOFIELDCOLL_HXX
#include <boost/scoped_ptr.hpp>
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index f738fe4c8fd1..6034498cea20 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.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 SW_UNOFRAME_HXX
-#define SW_UNOFRAME_HXX
+#ifndef INCLUDED_SW_INC_UNOFRAME_HXX
+#define INCLUDED_SW_INC_UNOFRAME_HXX
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/container/XNamed.hpp>
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index 0c9e885cf6df..5c3dc057e97e 100644
--- a/sw/inc/unoidxcoll.hxx
+++ b/sw/inc/unoidxcoll.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 SW_UNOIDXCOLL_HXX
-#define SW_UNOIDXCOLL_HXX
+#ifndef INCLUDED_SW_INC_UNOIDXCOLL_HXX
+#define INCLUDED_SW_INC_UNOIDXCOLL_HXX
#include <unocoll.hxx>
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index dce014faba05..b549792729dd 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.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 _UNOMAP_HXX
-#define _UNOMAP_HXX
+#ifndef INCLUDED_SW_INC_UNOMAP_HXX
+#define INCLUDED_SW_INC_UNOMAP_HXX
#include <svl/itemprop.hxx>
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index d54cea41ed36..981a309073ed 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.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 SW_UNOMID_HXX
-#define SW_UNOMID_HXX
+#ifndef INCLUDED_SW_INC_UNOMID_H
+#define INCLUDED_SW_INC_UNOMID_H
#define MID_MIRROR_VERT 0
#define MID_MIRROR_HORZ_EVEN_PAGES 1
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index e326ad3cc3ea..d906f3d5d438 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOPARAGRAPH_HXX
-#define SW_UNOPARAGRAPH_HXX
+#ifndef INCLUDED_SW_INC_UNOPARAGRAPH_HXX
+#define INCLUDED_SW_INC_UNOPARAGRAPH_HXX
#include <memory>
@@ -347,6 +347,6 @@ public:
};
-#endif // SW_UNOPARAGRAPH_HXX
+#endif // INCLUDED_SW_INC_UNOPARAGRAPH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 32f635ee69d7..66a56d6714f1 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOPRNMS_HXX
-#define _UNOPRNMS_HXX
+#ifndef INCLUDED_SW_INC_UNOPRNMS_HXX
+#define INCLUDED_SW_INC_UNOPRNMS_HXX
#include <sal/types.h>
#include <tools/solar.h>
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 25649b49ec44..25d2e7904ee9 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.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 SW_UNOREDLINE_HXX
-#define SW_UNOREDLINE_HXX
+#ifndef INCLUDED_SW_INC_UNOREDLINE_HXX
+#define INCLUDED_SW_INC_UNOREDLINE_HXX
#include <unotext.hxx>
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 2eedea80611d..ed2595ae4506 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.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 _UNOREDLINES_HXX
-#define _UNOREDLINES_HXX
+#ifndef INCLUDED_SW_INC_UNOREDLINES_HXX
+#define INCLUDED_SW_INC_UNOREDLINES_HXX
#include <unocoll.hxx>
#include <unobaseclass.hxx>
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 2baeb3a97346..51e417b690fb 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.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 UNOSETT_HXX
-#define UNOSETT_HXX
+#ifndef INCLUDED_SW_INC_UNOSETT_HXX
+#define INCLUDED_SW_INC_UNOSETT_HXX
#include <swtypes.hxx>
#include <calbck.hxx>
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 45936615510f..9330e7d1ff22 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.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 _UNOSRCH_HXX
-#define _UNOSRCH_HXX
+#ifndef INCLUDED_SW_INC_UNOSRCH_HXX
+#define INCLUDED_SW_INC_UNOSRCH_HXX
#include <com/sun/star/util/XPropertyReplace.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 132a206f77d0..73759477c247 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.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 _UNOSTYLE_HXX
-#define _UNOSTYLE_HXX
+#ifndef INCLUDED_SW_INC_UNOSTYLE_HXX
+#define INCLUDED_SW_INC_UNOSTYLE_HXX
#include <boost/shared_ptr.hpp>
#include <svl/style.hxx>
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 19f1db863bee..a888a0007349 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOTBL_HXX
-#define SW_UNOTBL_HXX
+#ifndef INCLUDED_SW_INC_UNOTBL_HXX
+#define INCLUDED_SW_INC_UNOTBL_HXX
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index bb43f1d30f0b..cff6b4eb591d 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOTEXT_HXX
-#define SW_UNOTEXT_HXX
+#ifndef INCLUDED_SW_INC_UNOTEXT_HXX
+#define INCLUDED_SW_INC_UNOTEXT_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -358,6 +358,6 @@ public:
::com::sun::star::uno::RuntimeException);
};
-#endif // SW_UNOTEXT_HXX
+#endif // INCLUDED_SW_INC_UNOTEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 494aaff96535..7a44738db145 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOTEXTBODYHF_HXX
-#define SW_UNOTEXTBODYHF_HXX
+#ifndef INCLUDED_SW_INC_UNOTEXTBODYHF_HXX
+#define INCLUDED_SW_INC_UNOTEXTBODYHF_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -195,6 +195,6 @@ public:
};
-#endif // SW_UNOTEXTBODYHF_HXX
+#endif // INCLUDED_SW_INC_UNOTEXTBODYHF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index fc45d436528f..b683976f3055 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOTEXTCURSOR_HXX
-#define SW_UNOTEXTCURSOR_HXX
+#ifndef INCLUDED_SW_INC_UNOTEXTCURSOR_HXX
+#define INCLUDED_SW_INC_UNOTEXTCURSOR_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -375,6 +375,6 @@ public:
};
-#endif // SW_UNOTEXTCURSOR_HXX
+#endif // INCLUDED_SW_INC_UNOTEXTCURSOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 2370345a37f5..63969a9fe2c3 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOTEXTRANGE_HXX
-#define SW_UNOTEXTRANGE_HXX
+#ifndef INCLUDED_SW_INC_UNOTEXTRANGE_HXX
+#define INCLUDED_SW_INC_UNOTEXTRANGE_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -317,6 +317,6 @@ public:
};
-#endif // SW_UNOTEXTRANGE_HXX
+#endif // INCLUDED_SW_INC_UNOTEXTRANGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index bf6678fabbc6..ccad770c8e83 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.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 SW_UNOTXDOC_HXX
-#define SW_UNOTXDOC_HXX
+#ifndef INCLUDED_SW_INC_UNOTXDOC_HXX
+#define INCLUDED_SW_INC_UNOTXDOC_HXX
#include "swdllapi.h"
#include <sfx2/sfxbasemodel.hxx>
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index f529c32f2b2c..14ad0b033edf 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.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 SW_USRFLD_HXX
-#define SW_USRFLD_HXX
+#ifndef INCLUDED_SW_INC_USRFLD_HXX
+#define INCLUDED_SW_INC_USRFLD_HXX
#include "swdllapi.h"
#include "fldbas.hxx"
@@ -117,6 +117,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
};
-#endif // SW_USRFLD_HXX
+#endif // INCLUDED_SW_INC_USRFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index d916bbf8dfa6..485be267e50b 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VIEWOPT_HXX
-#define _VIEWOPT_HXX
+#ifndef INCLUDED_SW_INC_VIEWOPT_HXX
+#define INCLUDED_SW_INC_VIEWOPT_HXX
#include <config_features.h>
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 734a066a1949..1df035648521 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.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 SW_VIEWSH_HXX
-#define SW_VIEWSH_HXX
+#ifndef INCLUDED_SW_INC_VIEWSH_HXX
+#define INCLUDED_SW_INC_VIEWSH_HXX
#include <com/sun/star/embed/XClassifiedObject.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
@@ -614,6 +614,6 @@ inline const SfxItemPool& SwViewShell::GetAttrPool() const
-#endif // SW_VIEWSH_HXX
+#endif // INCLUDED_SW_INC_VIEWSH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index c43ecdf2e239..194efe4ee55a 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.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 _VISCRS_HXX
-#define _VISCRS_HXX
+#ifndef INCLUDED_SW_INC_VISCRS_HXX
+#define INCLUDED_SW_INC_VISCRS_HXX
#include <config_features.h>
@@ -179,6 +179,6 @@ public:
};
-#endif // _VISCRS_HXX
+#endif // INCLUDED_SW_INC_VISCRS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index eca34a639643..cefe9e635b80 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.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 _SWWDOCSH_HXX
-#define _SWWDOCSH_HXX
+#ifndef INCLUDED_SW_INC_WDOCSH_HXX
+#define INCLUDED_SW_INC_WDOCSH_HXX
#include "swdllapi.h"
#include "docsh.hxx"
#include <swdll.hxx>
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 74ae197129d9..74d3185908df 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCCELL_HXX
-#define _ACCCELL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
#include "acccontext.hxx"
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 8f2d76225bfc..b8d164b7a128 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCBASE_HXX
-#define _ACCBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
#include <accframe.hxx>
#include <accmap.hxx>
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index fe73a901eec4..2ff5576059e7 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCDOC_HXX
-#define _ACCDOC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
#include "acccontext.hxx"
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index a301f85e37d5..a459eb1cd8d0 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCEMBEDDED_HXX
-#define _ACCEMBEDDED_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
#include "accnotextframe.hxx"
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index ae0256d69c84..6b0f4a5df613 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFOOTNOTE_HXX
-#define _ACCFOOTNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
#include <sal/types.h>
#include <acccontext.hxx>
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 579d087be7f4..08c8139aa721 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFRAME_HXX
-#define _ACCFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAME_HXX
#include <swrect.hxx>
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index a1ee392d96d0..dd99bd8c503f 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFRAMEBASE_HXX
-#define _ACCFRAMEBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
#include <acccontext.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 355c9aebcf6a..47e1f3ba6684 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFRMOBJ_HXX
-#define _ACCFRMOBJ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJ_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJ_HXX
#include <sal/types.h>
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index 39f03b963cc8..92e3402598cd 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFRMOBJMAP_HXX
-#define _ACCFRMOBJMAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJMAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJMAP_HXX
#include <accfrmobj.hxx>
#include <svx/svdtypes.hxx>
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index bebaafecbdef..d54a6315ba73 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCFRMOBJSLIST_HXX
-#define _ACCFRMOBJSLIST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
#include <accfrmobj.hxx>
#include <swrect.hxx>
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index f8c3ac422229..51bbd7c5550f 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCGRAPHIC_HXX
-#define _ACCGRAPHIC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCGRAPHIC_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCGRAPHIC_HXX
#include "accnotextframe.hxx"
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 07d84edc733c..f6eed47a9e0c 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCHEADERFOOTER_HXX
-#define _ACCHEADERFOOTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHEADERFOOTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHEADERFOOTER_HXX
#include "acccontext.hxx"
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 21b60ebc0ec8..0970e5cfa62e 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCHYPERLINK_HXX
-#define _ACCHYPERLINK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERLINK_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERLINK_HXX
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <rtl/ref.hxx>
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index 1e106ad5b53b..639fb3acc664 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCHYPERTEXTDATA_HXX
-#define _ACCHYPERTEXTDATA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERTEXTDATA_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERTEXTDATA_HXX
#include <cppuhelper/weakref.hxx>
#include <map>
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 4e86e3937afe..bcbef05911f3 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCNOTEXTFRAME_HXX
-#define _ACCNOTEXTFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTFRAME_HXX
#include "accframebase.hxx"
#include <com/sun/star/accessibility/XAccessibleImage.hpp>
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index ffd3cd430c52..b4b27f89bfbc 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCPAGE_HXX
-#define _ACCPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPAGE_HXX
#include "acccontext.hxx"
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 468e33a02388..55d2e77d7b2a 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.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 _ACCPARA_HXX
-#define _ACCPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
#include <acccontext.hxx>
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index d6436365d1f5..a2efbe862cf0 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCPORTIONS_HXX
-#define _ACCPORTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPORTIONS_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPORTIONS_HXX
#include <SwPortionHandler.hxx>
#include <sal/types.h>
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index 4c0f431984b7..b911da101be7 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCPREVIEW_HXX
-#define _ACCPREVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPREVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPREVIEW_HXX
#include "accdoc.hxx"
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 2b1e6433c163..5e51987df66a 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCSELECTIONHELPER_HXX_
-#define _ACCSELECTIONHELPER_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
class SwAccessibleContext;
class SwFEShell;
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index d71f45cabd71..9c0a365e2b6e 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCTABLE_HXX
-#define _ACCTABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTABLE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTABLE_HXX
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index e0568c14f124..8c891cf25975 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACCTEXTFRAME_HXX
-#define _ACCTEXTFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTEXTFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTEXTFRAME_HXX
#include "accframebase.hxx"
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index b95759db8a12..02866abad9ae 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PARACHANGETRACKINGINFO_HXX_
-#define _PARACHANGETRACKINGINFO_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_PARACHANGETRACKINGINFO_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_PARACHANGETRACKINGINFO_HXX
#include <sal/types.h>
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 07f8dcc58dc9..ba555825cda8 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.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 _TEXTMARKUPHELPER_HXX_
-#define _TEXTMARKUPHELPER_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
#include <sal/types.h>
#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
diff --git a/sw/source/core/crsr/BlockCursor.hxx b/sw/source/core/crsr/BlockCursor.hxx
index 1bea5c594b8f..b7d6ec99e0fa 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.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 _BLOCKCURSOR_HXX
-#define _BLOCKCURSOR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
class IBlockCursor;
class SwCrsrShell;
diff --git a/sw/source/core/crsr/IBlockCursor.hxx b/sw/source/core/crsr/IBlockCursor.hxx
index cbe91add8f4a..fd48ecb0b744 100644
--- a/sw/source/core/crsr/IBlockCursor.hxx
+++ b/sw/source/core/crsr/IBlockCursor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef IBLOCKCURSOR_HXX_INCLUDED
-#define IBLOCKCURSOR_HXX_INCLUDED
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_IBLOCKCURSOR_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_IBLOCKCURSOR_HXX
class SwShellCrsr;
class Point;
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 1fe5f0918684..3446a58d8e13 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CALLNK_HXX
-#define _CALLNK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
#include <tools/solar.h>
@@ -45,6 +45,6 @@ public:
static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm );
};
-#endif // _CALLNK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index d2851ef96f4e..edd7b3aed398 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWSTYLEMANAGER_HXX
-#define _SWSTYLEMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
class IStyleAccess;
class SfxItemSet;
IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems = 0 );
-#endif //_SWSTYLEMANAGER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 2be7824e240a..bad3b4325fde 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CANCELLABLEJOB_HXX
-#define _CANCELLABLEJOB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
#include "sal/config.h"
#include "cppuhelper/implbase1.hxx"
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx
index 43ab1864aab9..e7a85a8e6947 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GETMETRICVAL_HXX
-#define _GETMETRICVAL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
#include <tools/solar.h>
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index e5f08b342c27..c4af698c703f 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_BOOKMARK_MARKMANAGER_HXX
-#define _SW_BOOKMARK_MARKMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MARKMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MARKMANAGER_HXX
#include <IMark.hxx>
#include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 4611155a4ce1..76b862239e76 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWGRAMMARMARKUP_HXX
-#define _SWGRAMMARMARKUP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
#include <wrong.hxx>
#include <vector>
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 325deb9ccc03..1cb7670cea95 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_PORTIONHANDLER_HXX
-#define _SW_PORTIONHANDLER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
#include <tools/solar.h>
#include <txttypes.hxx>
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 8616edb8f89a..808b6b30da75 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_TXT_FMT_COLL_HXX
-#define SW_UNDO_TXT_FMT_COLL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
#include <undobj.hxx>
#include <swundo.hxx>
@@ -239,6 +239,6 @@ class SwUndoNumruleRename : public SwUndo
SwRewriter GetRewriter() const;
};
-#endif // SW_UNDO_TXT_FMT_COLL_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx
index 167d8a3fd639..6efaf6d32b56 100644
--- a/sw/source/core/inc/SwUndoPageDesc.hxx
+++ b/sw/source/core/inc/SwUndoPageDesc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_PAGE_DESC_HXX
-#define SW_UNDO_PAGE_DESC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOPAGEDESC_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOPAGEDESC_HXX
#include <undobj.hxx>
#include <pagedesc.hxx>
diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx
index 850b13247536..08cc3e15c852 100644
--- a/sw/source/core/inc/SwUndoTOXChange.hxx
+++ b/sw/source/core/inc/SwUndoTOXChange.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_TOX_CHANGE_HXX
-#define SW_UNDO_TOX_CHANGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
#include <undobj.hxx>
#include <tox.hxx>
@@ -39,6 +39,6 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & );
};
-#endif // SW_UNDO_TOX_CHANGE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index a499907bb4e8..c3901088273b 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_XMLBLOCKEXPORT_HXX
-#define _SW_XMLBLOCKEXPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKEXPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKEXPORT_HXX
#include <xmloff/xmlexp.hxx>
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 9b665040ebd4..6955ff478148 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_XMLBLOCKIMPORT_HXX
-#define _SW_XMLBLOCKIMPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
#include <xmloff/xmlimp.hxx>
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 204de9a0cffc..52605b31dda1 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_XMLBLOCKLISTCONTEXT_HXX
-#define _SW_XMLBLOCKLISTCONTEXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKLISTCONTEXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKLISTCONTEXT_HXX
#include <xmloff/xmlictxt.hxx>
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index ec21818d1a10..5afd8f1b4d08 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_XMLTEXTBLOCKS_HXX
-#define _SW_XMLTEXTBLOCKS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 6df0bc2cb547..b352dfe04e8d 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.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 _SW_XTEXT_DEFAULTS_HXX
-#define _SW_XTEXT_DEFAULTS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 72c82bcfebbe..84e6a6507342 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_ATTRIBUTE_HXX
-#define SW_UNDO_ATTRIBUTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
#include <undobj.hxx>
#include <memory>
@@ -272,6 +272,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
};
-#endif // SW_UNDO_ATTRIBUTE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index a9650f5ea056..4cfb8543c7d0 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_BOOKMARK_HXX
-#define SW_UNDO_BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
#include <undobj.hxx>
@@ -68,6 +68,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
};
-#endif // SW_UNDO_BOOKMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index e71e9d028fad..13e46ac14087 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDOCORE_HXX
-#define SW_UNDOCORE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
#include <undobj.hxx>
#include <calbck.hxx>
@@ -235,6 +235,6 @@ ShortenString(const OUString & rStr, xub_StrLen nLength, const OUString & rFillS
*/
OUString DenoteSpecialCharacters(const OUString & rStr);
-#endif // SW_UNDOCORE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index a21b56cf8120..41169bdd66f3 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_DELETE_HXX
-#define SW_UNDO_DELETE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
#include <undobj.hxx>
#include <rtl/ustring.hxx>
@@ -100,6 +100,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
};
-#endif // SW_UNDO_DELETE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 54f335cd4d9d..b9d9c3ae063e 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_DRAW_HXX
-#define SW_UNDO_DRAW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
#include <undobj.hxx>
#include <svx/svdundo.hxx>
@@ -129,6 +129,6 @@ public:
void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& );
};
-#endif // SW_UNDO_DRAW_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 3a046b2848f9..787d93a5c952 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_INSERT_HXX
-#define SW_UNDO_INSERT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
#include <undobj.hxx>
#include <rtl/ustring.hxx>
@@ -211,6 +211,6 @@ public:
void SetDrawObj( sal_uInt8 nLayerId );
};
-#endif // SW_UNDO_INSERT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index bf0ac205b7c0..2ab0bf7fef5b 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_MANAGER_HXX
-#define SW_UNDO_MANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
#include <IDocumentUndoRedo.hxx>
#include <boost/shared_ptr.hpp>
@@ -107,6 +107,6 @@ private:
} // namespace sw
-#endif // SW_UNDO_MANAGER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index b037e8f2169c..bf92ea626613 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_NUMBERING_HXX
-#define SW_UNDO_NUMBERING_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
#include <vector>
#include <undobj.hxx>
@@ -140,6 +140,6 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & );
};
-#endif // SW_UNDO_NUMBERING_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 6e6f02bc66ed..e43b4f62cf03 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_OVERWRITE_HXX
-#define SW_UNDO_OVERWRITE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ustring.hxx>
@@ -88,6 +88,6 @@ public:
sal_Bool HasData() const { return aChanges.size() > 0; }
};
-#endif // SW_UNDO_OVERWRITE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index e796dfc39dd4..24476073e2e5 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_REDLINE_HXX
-#define SW_UNDO_REDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
#include <undobj.hxx>
@@ -128,6 +128,6 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
};
-#endif // SW_UNDO_REDLINE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 0cca72b77a2d..00de819f50e0 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_SECTION_HXX
-#define SW_UNDO_SECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
#include <undobj.hxx>
#include <memory>
@@ -65,6 +65,6 @@ SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
-#endif // SW_UNDO_SECTION_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 08b2d48417a6..5deb7ea8a5a1 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_SORT_HXX
-#define SW_UNDO_SORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
#include <undobj.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
@@ -81,6 +81,6 @@ public:
void Insert( sal_uLong nOrgPos, sal_uLong nNewPos );
};
-#endif // SW_UNDO_SORT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index f69a0d4869db..3b9e93f8e598 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_MOVE_HXX
-#define SW_UNDO_MOVE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
#include <undobj.hxx>
@@ -82,6 +82,6 @@ public:
void SetMoveRedlines( bool b ) { bMoveRedlines = b; }
};
-#endif // SW_UNDO_MOVE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 2788d83d3095..0fd261368732 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNDO_TABLE_HXX
-#define SW_UNDO_TABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
#include <undobj.hxx>
#include <memory>
@@ -376,6 +376,6 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & );
};
-#endif // SW_UNDO_TABLE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index e84560e108c3..b6ae8f8f3717 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ACORRECT_HXX
-#define _ACORRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ACORRECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ACORRECT_HXX
#include <editeng/svxacorr.hxx>
#include <swundo.hxx>
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 734d3bef9c36..90798d6292e2 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ANCHOREDOBJECTPOSITION_HXX
-#define _ANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
#include <swtypes.hxx>
// #i11860#
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index 05b1bb62342e..70bbcbd985f0 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ASCHARANCHOREDOBJECTPOSITION_HXX
-#define _ASCHARANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
#include <anchoredobjectposition.hxx>
#include <sal/types.h>
diff --git a/sw/source/core/inc/attrhint.hxx b/sw/source/core/inc/attrhint.hxx
index af6891997edf..34d563179978 100644
--- a/sw/source/core/inc/attrhint.hxx
+++ b/sw/source/core/inc/attrhint.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ATTRHINT_HXX
-#define _ATTRHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ATTRHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ATTRHINT_HXX
#include <svl/hint.hxx>
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 9062ea9aaa43..a5a865eabdb4 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BLINK_HXX
-#define _BLINK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BLINK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BLINK_HXX
class SwLinePortion;
class SwRootFrm;
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index e73b70198c48..769fe1ea4eb2 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.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 _BODYFRM_HXX
-#define _BODYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
#include <tools/mempool.hxx>
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 37f32ee19e17..761842fe8da7 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BOOKMRK_HXX
-#define _BOOKMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
#include <cppuhelper/weakref.hxx>
#include <sfx2/Metadatable.hxx>
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 050723ccea3e..7168b569a9aa 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_CELLFRM_HXX
-#define SW_CELLFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
#include <tools/mempool.hxx>
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index f8da74e82835..3eba858ab9a4 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CNTFRM_HXX
-#define _CNTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CNTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CNTFRM_HXX
#include "frame.hxx"
#include "flowfrm.hxx"
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 10986274026c..93ee8b163668 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COLFRM_HXX
-#define _COLFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
#include <tools/mempool.hxx>
#include "ftnboss.hxx"
@@ -35,6 +35,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm)
};
-#endif //_COLFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 314cdf83fdb5..ae74d74cd824 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CROSSREFBOOKMRK_HXX
-#define _CROSSREFBOOKMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
#include <IMark.hxx>
#include <bookmrk.hxx>
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index f5a537fbd0f6..c175c7cecd7b 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DBG_LAY_HXX
-#define _DBG_LAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DBG_LAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DBG_LAY_HXX
#define PROT_FILE_INIT 0x00000000
#define PROT_INIT 0x00000001
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 5dd9133bbaeb..1f84e50b414b 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DFLYOBJ_HXX
-#define _DFLYOBJ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
#include <svx/svdovirt.hxx>
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 3bc12878f5af..d4597aef76a7 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCFLD_HXX
-#define _DOCFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCFLD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCFLD_HXX
#include <calc.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 982eafa8fc4a..64e34fb5609a 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SORT_HXX
-#define _SORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCSORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCSORT_HXX
#include <ndindex.hxx>
#include <vector>
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 2fbcb5eeb8a5..0def0d698cc8 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCTXM_HXX
-#define _DOCTXM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCTXM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCTXM_HXX
#include <tools/gen.hxx>
#include <tox.hxx>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 86c18b863015..657026c6f32e 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAWFONT_HXX
-#define _DRAWFONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
#include <tools/solar.h>
#include <tools/debug.hxx>
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index 3fd551c17fa8..b177e9cc00e9 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _LAYOUTDUMP_HXX
-#define _LAYOUTDUMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DUMPFILTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DUMPFILTER_HXX
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XExporter.hpp>
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 66aa2c3dcda6..727c060ea67f 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.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 _DVIEW_HXX
-#define _DVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DVIEW_HXX
#include <svx/fmview.hxx>
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 54961f4daf61..462dfbd87ab9 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ENVIRONMENTOFANCHOREDOBJECT_HXX
-#define _ENVIRONMENTOFANCHOREDOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX
class SwFrm;
class SwLayoutFrm;
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 2a2fa7a707ba..8821698580d5 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FIELDHINT_HXX
-#define _FIELDHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FIELDHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FIELDHINT_HXX
#include <svl/hint.hxx>
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index b0df0acdc808..d9fa0953a796 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FINALTHREADMANAGER_HXX
-#define _FINALTHREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
#include "sal/config.h"
#include "cppuhelper/factory.hxx"
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 2a75f9c40c71..398d5bd9f819 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FLOWFRM_HXX
-#define _FLOWFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
class SwPageFrm;
class SwRect;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 1c6328c09108..5d94e6a1041c 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_FLYFRM_HXX
-#define SW_FLYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRM_HXX
#include "layfrm.hxx"
#include <list>
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 067393734467..2fb9c0e012e4 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.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 _FLYFRMS_HXX
-#define _FLYFRMS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
#include "flyfrm.hxx"
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index d92a5e4196f4..27ac5b41e88e 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FNTCACHE_HXX
-#define _FNTCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
#include <vcl/font.hxx>
#include <tools/mempool.hxx>
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5e91620ae190..8c1006174cf1 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_FRAME_HXX
-#define SW_FRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX
#include <vector>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 4220ee0c690c..b6bb3ce377ac 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRMINF_HXX
-#define _FRMINF_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
#include "swtypes.hxx"
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index c3c609fd097b..33043516190c 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRMTOOL_HXX
-#define _FRMTOOL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
#include "swtypes.hxx"
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 5775b7745e89..1822a3513511 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FTNBOSS_HXX
-#define _FTNBOSS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FTNBOSS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FTNBOSS_HXX
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index ebd1b097517c..862b86357214 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FTNFRM_HXX
-#define _FTNFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FTNFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FTNFRM_HXX
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index d6701b5872d8..ba6b3625aba6 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HFFRM_HXX
-#define _HFFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
#include <tools/mempool.hxx>
#include "layfrm.hxx"
diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx
index 2ca9d9fc3a56..0cee4360810c 100644
--- a/sw/source/core/inc/ifinishedthreadlistener.hxx
+++ b/sw/source/core/inc/ifinishedthreadlistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IFINISHEDTHREADLISTENER_HXX
-#define _IFINISHEDTHREADLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_IFINISHEDTHREADLISTENER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_IFINISHEDTHREADLISTENER_HXX
#include <osl/interlck.h>
diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx
index 2103ccb92951..47e07dd687b6 100644
--- a/sw/source/core/inc/ithreadlistenerowner.hxx
+++ b/sw/source/core/inc/ithreadlistenerowner.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ITHREADLISTENEROWNER_HXX
-#define _ITHREADLISTENEROWNER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
#include <ifinishedthreadlistener.hxx>
#include <boost/weak_ptr.hpp>
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 2cf740b94474..29f1f8296097 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.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 _LAYACT_HXX
-#define _LAYACT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
#include "swtypes.hxx"
#include "swrect.hxx"
@@ -228,6 +228,6 @@ inline void SwLayAction::SetCheckPageNum( sal_uInt16 nNew )
nCheckPageNum = nNew;
}
-#endif //_LAYACT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index fd8fb2a001e0..b9a0a40ca557 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _LAYCACHE_HXX
-#define _LAYCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
#include <tools/solar.h>
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index fdd6b7cb034e..30af36c8e9aa 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.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 SW_LAYFRM_HXX
-#define SW_LAYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
#include "frame.hxx"
@@ -198,6 +198,6 @@ inline SwFrm* SwLayoutFrm::GetLastLower()
return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->GetLastLower());
}
-#endif // SW_LAYFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 2750a361136f..2454d2df7187 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.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 _LAYOUTER_HXX
-#define _LAYOUTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
#include "swtypes.hxx"
@@ -141,7 +141,7 @@ public:
extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm );
-#endif //_LAYOUTER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index a4afc5819211..8683d68f69fc 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.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 _MOVEDFWDFRMSBYOBJPOS_HXX
-#define _MOVEDFWDFRMSBYOBJPOS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MOVEDFWDFRMSBYOBJPOS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MOVEDFWDFRMSBYOBJPOS_HXX
#include <map>
#include <sal/types.h>
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 5117481f86ea..6ad480c53cc1 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.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 SW_MVSAVE_HXX
-#define SW_MVSAVE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
#include <vcl/keycod.hxx>
#include <IDocumentMarkAccess.hxx>
@@ -196,6 +196,6 @@ public:
};
-#endif // SW_MVSAVE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 080163159532..89de8533e131 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.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 _NODE2LAY_HXX
-#define _NODE2LAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
#include <tools/solar.h>
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 779f67ac2f87..734f0c1796fa 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _NOTEURL_HXX
-#define _NOTEURL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
#include "swrect.hxx"
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index cbaa1995f16a..d514d8af7e29 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.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 SW_NOTXTFRM_HXX
-#define SW_NOTXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
#include <cntfrm.hxx>
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 07ed8bdd2676..fc5964c46885 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.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 _OBJECTFORMATTER_HXX
-#define _OBJECTFORMATTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_OBJECTFORMATTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_OBJECTFORMATTER_HXX
#include <sal/types.h>
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index ef545d10a1d7..365c807a18db 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.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 _OBSERVABLETHREAD_HXX
-#define _OBSERVABLETHREAD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX
#include <osl/thread.hxx>
#include <rtl/ref.hxx>
diff --git a/sw/source/core/inc/pagedeschint.hxx b/sw/source/core/inc/pagedeschint.hxx
index 6857521b649c..715caee10cf9 100644
--- a/sw/source/core/inc/pagedeschint.hxx
+++ b/sw/source/core/inc/pagedeschint.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PAGEDESCHINT_HXX
-#define _PAGEDESCHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEDESCHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAGEDESCHINT_HXX
#include <svl/hint.hxx>
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index d633e5a8c35c..31087175d306 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.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 _PAGEFRM_HXX
-#define _PAGEFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
#include <viewsh.hxx>
#include "ftnboss.hxx"
@@ -440,6 +440,6 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const
-#endif //_PAGEFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 647596e6a6dd..b1e6b90b8504 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PAMTYP_HXX
-#define _PAMTYP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX
#include <unotools/textsearch.hxx>
#include <node.hxx>
diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx
index 4863cb7fbcb8..60dc7a650bda 100644
--- a/sw/source/core/inc/prevwpage.hxx
+++ b/sw/source/core/inc/prevwpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PREVIEWPAGES_HXX
-#define _PREVIEWPAGES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PREVWPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PREVWPAGE_HXX
// classes <Point>, <Size> and <Rectangle>
#include <tools/gen.hxx>
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 7d1fab25cb0a..155776d850e3 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.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 _PTQUEUE_HXX
-#define _PTQUEUE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PTQUEUE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PTQUEUE_HXX
//Leider vertragen wir es nicht so gut, wenn wir mehr als ein Paint
//gleichzeitig verarbeiten sollen. Insbesondere beim Drucken kommt dies
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index e616f518e235..ba330e383dbd 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.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 _RETRIEVEDINPUTSTREAMDATA_HXX
-#define _RETRIEVEDINPUTSTREAMDATA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEDINPUTSTREAMDATA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEDINPUTSTREAMDATA_HXX
#include <tools/link.hxx>
#include <sal/types.h>
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index a7ddbc530402..267d5fe56494 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.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 _RETRIEVEINPUTSTREAM_HXX
-#define _RETRIEVEINPUTSTREAM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
#include <observablethread.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 6410bf7fcba0..e56f664a72a8 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.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 _RETRIEVEINPUTSTREAMCONSUMER_HXX
-#define _RETRIEVEINPUTSTREAMCONSUMER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 3bb927d850f0..7a30ea88c023 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.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 _ROLBCK_HXX
-#define _ROLBCK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
#include <tools/solar.h>
#include <svl/itemset.hxx>
@@ -425,6 +425,6 @@ public:
void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; }
};
-#endif // _ROLBCK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 7de8ef58a194..a40d847cb707 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.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 SW_ROOTFRM_HXX
-#define SW_ROOTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
#include "layfrm.hxx"
#include <viewsh.hxx>
@@ -370,6 +370,6 @@ inline void SwRootFrm::SetVirtPageNum( const sal_Bool bOf) const
((SwRootFrm*)this)->bIsVirtPageNum = bOf;
}
-#endif // SW_ROOTFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index abff0264f81d..2983e4561559 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.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 _ROWFRM_HXX
-#define _ROWFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
#include <tools/mempool.hxx>
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 719fbf7ff5eb..b824e072fcdc 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_SCRIPTINFO_HXX
-#define SW_SCRIPTINFO_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
#include <list>
#include <deque>
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 0d513b13f648..c25ef6314163 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.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 _SECTFRM_HXX
-#define _SECTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
#include <tools/mempool.hxx>
#include "layfrm.hxx"
@@ -161,6 +161,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const
}
-#endif //_SECTFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx
index 7f2ef6dd6101..2ee57c2f6ed7 100644
--- a/sw/source/core/inc/setmapvirtdev.hxx
+++ b/sw/source/core/inc/setmapvirtdev.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 _SETMAPVIRTDEV_HXX
-#define _SETMAPVIRTDEV_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SETMAPVIRTDEV_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SETMAPVIRTDEV_HXX
class OutputDevice;
class VirtualDevice;
diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx
index e82027138735..a4c820f35420 100644
--- a/sw/source/core/inc/sortedobjs.hxx
+++ b/sw/source/core/inc/sortedobjs.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 _SORTEDOBJS_HXX
-#define _SORTEDOBJS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
#include <sal/types.h>
#include <vector>
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index e5f0e20970e5..840485c40990 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.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 _SWBLOCKS_HXX
-#define _SWBLOCKS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
#include <tools/datetime.hxx>
#include <o3tl/sorted_vector.hxx>
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 6899521853f7..fb412c3ad93b 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.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 _SWCACHE_HXX
-#define _SWCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWCACHE_HXX
/*
* Es werden Pointer auf Objekte verwaltet. Diese werden in einem einfachen
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 7f29fd8bc69f..1169f9455e5e 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.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 _SWFNTCCH_HXX
-#define _SWFNTCCH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
#include <tools/mempool.hxx>
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 34edd1dabb50..8a4526cfe038 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.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 _SWFONT_HXX
-#define _SWFONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWFONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWFONT_HXX
#include <i18nlangtag/lang.h>
#include <tools/color.hxx>
diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx
index ac4650ad1818..aa920d78d0e5 100644
--- a/sw/source/core/inc/swselectionlist.hxx
+++ b/sw/source/core/inc/swselectionlist.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 _SWSELECTIONLIST_HXX
-#define _SWSELECTIONLIST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
#include <list>
@@ -86,6 +86,6 @@ public:
bool checkContext( const SwFrm* pCheck );
};
-#endif //_SWSELECTIONLIST_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index a9c38037b313..29b1b132f5f2 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.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 _SWTHREADJOINER_HXX
-#define _SWTHREADJOINER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
#include "com/sun/star/util/XJobManager.hpp"
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index 9629790a202a..e4c332287e1c 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.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 _SWTHREADMANAGER_HXX
-#define _SWTHREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
#include <osl/interlck.h>
#include <osl/mutex.hxx>
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 1041385562ba..15ad133f0946 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.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 SW_TABFRM_HXX
-#define SW_TABFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
#include <tools/mempool.hxx>
#include "layfrm.hxx"
@@ -223,6 +223,6 @@ inline SwTabFrm *SwTabFrm::GetFollow()
return (SwTabFrm*)SwFlowFrm::GetFollow();
}
-#endif // SW_TABFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 96895beb3947..5d2a701e24e9 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.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 _TBLRWCL_HXX
-#define _TBLRWCL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
#include <cstddef>
#include <vector>
#include <swtypes.hxx>
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index 4daf52959169..c4158c9dadc5 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_TEXTAPI_HXX
-#define SW_TEXTAPI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TEXTAPI_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TEXTAPI_HXX
#include <editeng/unoedsrc.hxx>
#include <editeng/unotext.hxx>
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index a0fceb4c1889..f345728ec66b 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.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 _THREADLISTENER_HXX
-#define _THREADLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
#include <ifinishedthreadlistener.hxx>
#include <ithreadlistenerowner.hxx>
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 4b47f323f5ed..aa6d952fed7c 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.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 _THREADMANAGER_HXX
-#define _THREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
#include <ithreadlistenerowner.hxx>
#include <vcl/timer.hxx>
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 0b629bf08a52..4673b52a8dcb 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.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 _TOCNTNTANCHOREDOBJECTPOSITION_HXX
-#define _TOCNTNTANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
#include <anchoredobjectposition.hxx>
class SwFrm;
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 6558ce98dce1..cab45c43763e 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.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 _TOLAYOUTANCHOREDOBJECTPOSITION_HXX
-#define _TOLAYOUTANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
#include <anchoredobjectposition.hxx>
#include <swtypes.hxx>
#include <swrect.hxx>
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 1d6fd1f1262b..5d0b3d9385f1 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.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 SW_TXMSRT_HXX
-#define SW_TXMSRT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
#include <i18nlangtag/lang.h>
#include <tox.hxx>
@@ -292,6 +292,6 @@ public:
};
-#endif // SW_TXMSRT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3f3a277505fb..6bde38bd2038 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.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 SW_TXTFRM_HXX
-#define SW_TXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXTFRM_HXX
#include <tools/mempool.hxx>
#include "cntfrm.hxx"
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 9222442e3d7c..debef5231eec 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.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 _TXTTYPES_HXX
-#define _TXTTYPES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
#include "swtypes.hxx"
@@ -92,6 +92,6 @@
#define POR_TABLEFT 0x0740
-#endif //_TXTTYPES_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx
index 4dc312247b4d..5d1ea5395fac 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.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 SW_UNDO_FLY_STR_ATTR_HXX
-#define SW_UNDO_FLY_STR_ATTR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
#include <undobj.hxx>
#include <swundo.hxx>
@@ -44,6 +44,6 @@ class SwUndoFlyStrAttr : public SwUndo
const OUString msNewStr;
};
-#endif // SW_UNDO_FLY_STR_ATTR_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index 74354448568d..753a35d448f2 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOBOOKMARK_HXX
-#define SW_UNOBOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -273,6 +273,6 @@ public:
SwXODFCheckboxField( ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0) : SwXFieldmark(true,
pBkm, pDoc) {}
};
-#endif // SW_UNOBOOKMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 94926455e1aa..347b77e46b78 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.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 _UNOEVENT_HXX
-#define _UNOEVENT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
#include <svtools/unoevent.hxx>
#include <svl/macitem.hxx>
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 19685a3d8952..c7d77c369e14 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOFIELD_HXX
-#define SW_UNOFIELD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 31927517aa09..999e3c19fa24 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOFLATPARA_HXX
-#define _UNOFLATPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index b95941852072..4652871e02b8 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.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 SW_UNOFLDMID_H
-#define SW_UNOFLDMID_H
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
#include <tools/solar.h>
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index da579dc0516c..d0685cdcacf1 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOFOOTNOTE_HXX
-#define SW_UNOFOOTNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -213,6 +213,6 @@ public:
};
-#endif // SW_UNOFOOTNOTE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index c975617695cd..e945c75580d8 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.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 SW_UNOIDX_HXX
-#define SW_UNOIDX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 01f1d12401ef..fcff17c64e24 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOMETA_HXX
-#define SW_UNOMETA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
#include <deque>
@@ -359,6 +359,6 @@ void getPrefixAndSuffix(
::com::sun::star::rdf::XMetadatable>& xMetaField,
OUString *const o_pPrefix, OUString *const o_pSuffix);
-#endif // SW_UNOMETA_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index 54d2313eacdd..cfa3694eafd6 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOPARAFRAMEENUM_HXX
-#define SW_UNOPARAFRAMEENUM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
#include <deque>
@@ -110,6 +110,6 @@ public:
};
-#endif // SW_UNOPARAFRAMEENUM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index be32d74647b2..d32dc8242a81 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.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 SW_UNOPORT_HXX
-#define SW_UNOPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
#include <memory>
#include <deque>
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 6aa02a2311d9..32a89a37ebcc 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOREFMARK_HXX
-#define SW_UNOREFMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -158,6 +158,6 @@ public:
};
-#endif // SW_UNOREFMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index a7a178e9ee8d..b21aaca37f0b 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_UNOSECTION_HXX
-#define SW_UNOSECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -239,6 +239,6 @@ public:
};
-#endif // SW_UNOSECTION_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 1ceb4131933b..89f01bd1447b 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOTEXTMARKUP_HXX
-#define _UNOTEXTMARKUP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 86e0ac4b9789..62442793f765 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.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 SW_VIEWIMP_HXX
-#define SW_VIEWIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
#include <rtl/ustring.hxx>
#include <tools/color.hxx>
@@ -333,6 +333,6 @@ inline void SwViewImp::AddAccessibleObj( const SdrObject *pObj )
SwRect aEmptyRect;
MoveAccessible( 0, pObj, aEmptyRect );
}
-#endif // SW_VIEWIMP_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index 8f372be0f1d0..b9ed68134c2e 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VISITURL_HXX
-#define _VISITURL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
#include <svl/lstner.hxx>
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index abb4807d24e9..2c06e5384482 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WRONG_HXX
-#define _WRONG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
#include <com/sun/star/container/XStringKeyMap.hpp>
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 6f34fbcaa23d..61dc7bbabfd0 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_LAYHELP_HXX
-#define SW_LAYHELP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX
#include <swrect.hxx>
#include <vector>
diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx
index 34028cac53b9..89a47e0f2ee7 100644
--- a/sw/source/core/layout/objectformatterlayfrm.hxx
+++ b/sw/source/core/layout/objectformatterlayfrm.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 _OBJECTFORMATTERLAYFRM_HXX
-#define _OBJECTFORMATTERLAYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERLAYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERLAYFRM_HXX
#include <objectformatter.hxx>
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index fde76429388e..eb52adaeaab6 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.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 _OBJECTFORMATTERTXTFRM_HXX
-#define _OBJECTFORMATTERTXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERTXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERTXTFRM_HXX
#include <objectformatter.hxx>
#include <sal/types.h>
diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
index ed5d98f44e4e..fcf495e72a50 100644
--- a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
+++ b/sw/source/core/layout/objstmpconsiderwrapinfl.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 _OBJSTMPCONSIDERWRAPINFL_HXX
-#define _OBJSTMPCONSIDERWRAPINFL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJSTMPCONSIDERWRAPINFL_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJSTMPCONSIDERWRAPINFL_HXX
#include <vector>
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 33a1df2a046f..bec49d21250e 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.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 _VIRTOUTP_HXX
-#define _VIRTOUTP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_VIRTOUTP_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_VIRTOUTP_HXX
#include <vcl/virdev.hxx>
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 6fa4b2cf39b4..2571c584e520 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ATRHNDL_HXX
-#define _ATRHNDL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ATRHNDL_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ATRHNDL_HXX
#define INITIAL_NUM_ATTR 3
#define NUM_ATTRIBUTE_STACKS 43
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index c6deb076376d..48fe7f94a385 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.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 _GUESS_HXX
-#define _GUESS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include "txttypes.hxx"
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 010cbdc840d5..6602f94b3594 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.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 _INFTXT_HXX
-#define _INFTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index acd35fcc8706..d550e4319404 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.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 _ITRATR_HXX
-#define _ITRATR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
#include <atrhndl.hxx>
#include "txttypes.hxx"
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index d4633173c9dc..bbaead1201bd 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.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 _ITRFORM2_HXX
-#define _ITRFORM2_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRFORM2_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRFORM2_HXX
#include "itrpaint.hxx"
class SwFlyCntPortion;
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index 12b95664ad4c..04b9170ef1b1 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.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 _ITRPAINT_HXX
-#define _ITRPAINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRPAINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRPAINT_HXX
#include "itrtxt.hxx"
class SwSaveClip; // SwTxtPainter
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index cd56e8e55745..d1e004283a4d 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.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 _ITRTXT_HXX
-#define _ITRTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
#include "swtypes.hxx"
#include "itratr.hxx"
#include "inftxt.hxx"
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index a462e6bfe839..3ba9795aff7e 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.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 _PORDROP_HXX
-#define _PORDROP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORDROP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORDROP_HXX
#include "portxt.hxx"
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 4c9e0874c361..77ece8afa223 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _POREXP_HXX
-#define _POREXP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_POREXP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_POREXP_HXX
#include "portxt.hxx"
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index fb6ff6497ac0..ef9f9567f7a2 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.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 _PORFLD_HXX
-#define _PORFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
#include "swtypes.hxx"
#include "porexp.hxx"
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index f5fbfa88f300..34a4dfe4d896 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.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 _PORFLY_HXX
-#define _PORFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
// OD 28.10.2003 #113049#
#include <ascharanchoredobjectposition.hxx>
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index b20e1eb14c50..48c5b7eff249 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.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 _PORFTN_HXX
-#define _PORFTN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFTN_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFTN_HXX
#include "porfld.hxx"
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index f368fbff4c46..0496a8a5c28c 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.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 _PORGLUE_HXX
-#define _PORGLUE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORGLUE_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORGLUE_HXX
#include "porlin.hxx"
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 3b7450e8e9f6..32e6128c931c 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.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 _PORHYPH_HXX
-#define _PORHYPH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORHYPH_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORHYPH_HXX
#include "porexp.hxx"
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index ac89498d782c..ccfa12d7cb81 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.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 _PORLAY_HXX
-#define _PORLAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
#include <tools/fract.hxx>
#include <scriptinfo.hxx>
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index fb17d745b782..429d865d05a8 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.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 _PORLIN_HXX
-#define _PORLIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORLIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLIN_HXX
#include "possiz.hxx"
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 5f48b54baa38..46ca418ab48e 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.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 _PORMULTI_HXX
-#define _PORMULTI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORMULTI_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORMULTI_HXX
#include "porlay.hxx"
#include "porexp.hxx"
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 82d0e0582152..4ace502be56a 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.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 _PORREF_HXX
-#define _PORREF_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORREF_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORREF_HXX
#include "portxt.hxx"
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index fcc616b4c5eb..574be5625d07 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.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 _PORRST_HXX
-#define _PORRST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
#include "porlay.hxx"
#include "porexp.hxx"
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 463c8dd3320d..2082712378cb 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.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 _PORTAB_HXX
-#define _PORTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTAB_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTAB_HXX
#include "porglue.hxx"
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 2ae4348233e9..a80183bfc337 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PORTOX_HXX
-#define _PORTOX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTOX_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTOX_HXX
#include "portxt.hxx"
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 34750eba1779..6831661b1e17 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.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 _PORTXT_HXX
-#define _PORTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
#include <tools/mempool.hxx>
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index 969dc9a2ddda..0e9fb3697715 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.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 _POSSIZ_HXX
-#define _POSSIZ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX
#include <tools/gen.hxx>
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 80bdba19395e..ff7a3b91a45c 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.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 _REDLNITR_HXX
-#define _REDLNITR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
#include "ndhints.hxx"
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index cedba1db5132..b96cd4325f46 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.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 _TXTCACHE_HXX
-#define _TXTCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
#include <sal/types.h>
#include <tools/mempool.hxx>
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 4c1398f78b95..b0b06094d34f 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.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 _TXTFLY_HXX
-#define _TXTFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
#include "swtypes.hxx"
#include "swrect.hxx"
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 86d34c8bd31d..7441d931d342 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.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 _TXTPAINT_HXX
-#define _TXTPAINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTPAINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTPAINT_HXX
#include <vcl/outdev.hxx>
class SwRect; // SwSaveClip
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 85afba89e3fb..42d052848ad5 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.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 _WIDORP_HXX
-#define _WIDORP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
class SwTxtFrm;
#include "swtypes.hxx"
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 18f692fccb5a..776f95e2622d 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -21,8 +21,8 @@
//!! This file is an exact copy of the same file in chart2 project
//!!
-#ifndef XMLRANGEHELPER_HXX
-#define XMLRANGEHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -66,7 +66,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange );
} // namespace XMLRangeHelper
//} // namespace chart
-// XMLRANGEHELPER_HXX
+// INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index cd8af84dd38b..0c6d5b69d5e0 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.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 WRTASC_HXX
-#define WRTASC_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX
+#define INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX
#include <shellio.hxx>
#include <wrt_fn.hxx>
@@ -41,6 +41,6 @@ public:
};
-#endif // _WRTASC_HXX
+#endif // _ INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 35a048130a82..257893893041 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CSS1KYWD_HXX
-#define _CSS1KYWD_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_CSS1KYWD_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_CSS1KYWD_HXX
#include <sal/types.h>
diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx
index 10745cdc7703..7af294944bf9 100644
--- a/sw/source/filter/html/htmlfld.hxx
+++ b/sw/source/filter/html/htmlfld.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HTMLFLD_HXX
-#define _HTMLFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX
#include "sal/config.h"
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index ca7923759ff7..371824cd24be 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HTMLFLY_HXX
-#define _HTMLFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
#include <tools/solar.h>
#include <o3tl/sorted_vector.hxx>
diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx
index e23386e63396..fd3a822907fc 100644
--- a/sw/source/filter/html/htmlform.hxx
+++ b/sw/source/filter/html/htmlform.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HTMLFORM_HXX
-#define _HTMLFORM_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX
enum HTMLEventType
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index 306646256258..2c0b3c9852ed 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.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 _HTMLNUM_HXX
-#define _HTMLNUM_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLNUM_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLNUM_HXX
#include <swtypes.hxx>
#include <string.h>
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index 882d2c9baee1..d43fc99f0682 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _HTMLVSH_HXX
-#define _HTMLVSH_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLVSH_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLVSH_HXX
#include <calbck.hxx>
class SwViewShell;
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index d326d86a9244..84a8b68ac628 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PARCSS1_HXX
-#define _PARCSS1_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_PARCSS1_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_PARCSS1_HXX
// tokens of the CSS1 parser
enum CSS1Token
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 687e8a99cc05..2de079894110 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.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 _SVXCSS1_HXX
-#define _SVXCSS1_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SVXCSS1_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_SVXCSS1_HXX
#include <svl/itemset.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index dfce455ec1f0..1bc5ca6cb499 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SWCSS1_HXX
-#define _SWCSS1_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_SWCSS1_HXX
#include "poolfmt.hxx"
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 03c5407528f7..fedc3afd80b9 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.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 _SWHTML_HXX
-#define _SWHTML_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SWHTML_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_SWHTML_HXX
#include <config_features.h>
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index bd6a826b3770..d62e210c13c7 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.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 _WRTHTML_HXX
-#define _WRTHTML_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_WRTHTML_HXX
+#define INCLUDED_SW_SOURCE_FILTER_HTML_WRTHTML_HXX
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/ptr_container/ptr_set.hpp>
@@ -655,6 +655,6 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt );
-#endif // _WRTHTML_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_HTML_WRTHTML_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index d57227912f3e..5242b12c237a 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.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 _FLTINI_HXX
-#define _FLTINI_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_FLTINI_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_FLTINI_HXX
#include <shellio.hxx>
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 584915dcf34e..ca8170345884 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.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 _FLTSHELL_HXX
-#define _FLTSHELL_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_FLTSHELL_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_FLTSHELL_HXX
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index c2e043439510..30a5997ac6a1 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_MS_MSFILTER_HXX
-#define SW_MS_MSFILTER_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_MSFILTER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_MSFILTER_HXX
#include <set>
#include <map>
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index a892e6b59621..301b8ff2bf5f 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.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 _RTF_HXX
-#define _RTF_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
#include <tools/solar.h>
@@ -43,7 +43,7 @@ public:
sal_uInt16 GetValue() const { return Value.nVal; }
};
-#endif // _RTF_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 6e126c97d589..71b590de6e0b 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.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 _WRT_FN_HXX
-#define _WRT_FN_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
#include "hintids.hxx"
// einige Forward-Deklarationen
@@ -55,6 +55,6 @@ SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
-#endif // _WRT_FN_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 729a6129543a..f4b7d50b1baa 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.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 _WRTSWTBL_HXX
-#define _WRTSWTBL_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
#include <tools/solar.h>
#include <tools/color.hxx>
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 43ab071ba6b4..01e9c1039674 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef WW_WWSTYLES_HXX
-#define WW_WWSTYLES_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_INC_WWSTYLES_HXX
+#define INCLUDED_SW_SOURCE_FILTER_INC_WWSTYLES_HXX
#include <sal/types.h>
diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx
index d642436e5695..df5581670e3f 100644
--- a/sw/source/filter/ww1/w1par.hxx
+++ b/sw/source/filter/ww1/w1par.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _W1PAR_HXX
-#define _W1PAR_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW1_W1PAR_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW1_W1PAR_HXX
#include <fltshell.hxx>
#include <w1class.hxx>
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index b6a5202df8cf..b8540a793081 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef W1STRUCT_HXX
-#define W1STRUCT_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW1_W1STRUCT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW1_W1STRUCT_HXX
// star view
#include <string.h>
diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx
index 1885da7e3a05..fb1b18de46c1 100644
--- a/sw/source/filter/ww8/WW8FibData.hxx
+++ b/sw/source/filter/ww8/WW8FibData.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_WW8_FIB_DATA_HXX
-#define INCLUDED_WW8_FIB_DATA_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8FIBDATA_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8FIBDATA_HXX
#include <IDocumentExternalData.hxx>
namespace ww8
@@ -40,6 +40,6 @@ public:
};
}
-#endif // INCLUDED_WW8_FIB_DATA_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WW8FIBDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 93ac96c9aabb..92fe35d47bb0 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef WW8_TABLE_INFO_HXX
-#define WW8_TABLE_INFO_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX
#include <boost/unordered_map.hpp>
#include <string>
#include <map>
@@ -352,6 +352,6 @@ public:
};
}
-#endif // WW8_TABLE_INFO_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 7e32502d3e78..7ad8d3a7f3ea 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ATTRIBUTEOUTPUTBASE_HXX_
-#define _ATTRIBUTEOUTPUTBASE_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
#include "fields.hxx"
#include "WW8TableInfo.hxx"
@@ -633,6 +633,6 @@ public:
};
-#endif // _ATTRIBUTEOUTPUTBASE_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index a2167d9af6d3..9cb14f5a97d5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCXATTRIBUTEOUTPUT_HXX_
-#define _DOCXATTRIBUTEOUTPUT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXATTRIBUTEOUTPUT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXATTRIBUTEOUTPUT_HXX
#include "attributeoutputbase.hxx"
#include "fields.hxx"
@@ -805,6 +805,6 @@ public:
bool GetWritingHeaderFooter( ) { return m_bWritingHeaderFooter; }
};
-#endif // _DOCXATTRIBUTEOUTPUT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXATTRIBUTEOUTPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 55945de59651..18017d1fbe5e 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCXEXPORT_HXX_
-#define _DOCXEXPORT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORT_HXX
#include "wrtww8.hxx"
@@ -239,6 +239,6 @@ private:
DocxExport& operator=( const DocxExport& );
};
-#endif // _DOCXEXPORT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index c18ea97a33eb..c1a86da85e12 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCXEXPORTFILTER_HXX_
-#define _DOCXEXPORTFILTER_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORTFILTER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORTFILTER_HXX
#include <oox/core/xmlfilterbase.hxx>
#include <oox/drawingml/chart/chartconverter.hxx>
@@ -55,6 +55,6 @@ private:
}
};
-#endif // _DOCXEXPORTFILTER_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORTFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx
index 23ce08c08a43..157f95a38d2a 100644
--- a/sw/source/filter/ww8/docxfootnotes.hxx
+++ b/sw/source/filter/ww8/docxfootnotes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef DOCXFOOTNOTES_HXX
-#define DOCXFOOTNOTES_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX
#include <vector>
@@ -84,6 +84,6 @@ public:
} // namespace docx
-#endif // DOCXFOOTNOTES_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXFOOTNOTES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxhelper.hxx b/sw/source/filter/ww8/docxhelper.hxx
index 60f7232a9eaf..d6d158fa24f0 100644
--- a/sw/source/filter/ww8/docxhelper.hxx
+++ b/sw/source/filter/ww8/docxhelper.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _DOCXHELPER_HXX_
-#define _DOCXHELPER_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXHELPER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXHELPER_HXX
#include <rtl/ustring.hxx>
@@ -20,6 +20,6 @@ struct DocxStringTokenMap
sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, OUString aName);
-#endif // _DOCXHELPER_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxtablestyleexport.hxx b/sw/source/filter/ww8/docxtablestyleexport.hxx
index 77e7036700f9..cd8d9d79defe 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.hxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _DOCXTABLESTYLEXPORT_HXX_
-#define _DOCXTABLESTYLEXPORT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_DOCXTABLESTYLEEXPORT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXTABLESTYLEEXPORT_HXX
#include <boost/shared_ptr.hpp>
#include <sax/fshelper.hxx>
@@ -27,6 +27,6 @@ public:
~DocxTableStyleExport();
};
-#endif // _DOCXTABLESTYLEXPORT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXTABLESTYLEEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 4a1127a83e09..f42c4e5cdffa 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ESCHER_HXX
-#define _ESCHER_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_ESCHER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_ESCHER_HXX
#include <filter/msfilter/escherex.hxx>
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 7dc3ea3f10bb..d3f8bb0b4035 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -18,8 +18,8 @@
*/
/// @HTML
-#ifndef WW_FIELDS_HXX
-#define WW_FIELDS_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
namespace ww
{
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index 55231b95ebbd..b77e74ae630d 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -19,8 +19,8 @@
//this is a shameless rip from sortedarray.hxx but changed to boost::unordered_set
-#ifndef WW_HASH_WRAP_HXX
-#define WW_HASH_WRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_HASH_WRAP_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_HASH_WRAP_HXX
#include <boost/unordered_set.hpp>
diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx
index d277522cf20f..cfcabb8ccf7a 100644
--- a/sw/source/filter/ww8/needed_cast.hxx
+++ b/sw/source/filter/ww8/needed_cast.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef WW_NEEDED_CAST_HXX
-#define WW_NEEDED_CAST_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX
#include "staticassert.hxx"
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 5bbded266556..60de3e4febaf 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTFATTRIBUTEOUTPUT_HXX_
-#define _RTFATTRIBUTEOUTPUT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFATTRIBUTEOUTPUT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFATTRIBUTEOUTPUT_HXX
#include "attributeoutputbase.hxx"
#include "rtfexport.hxx"
@@ -620,6 +620,6 @@ public:
void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE;
};
-#endif // _RTFATTRIBUTEOUTPUT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_RTFATTRIBUTEOUTPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 3df1c40bb809..930c45a2d98d 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTFEXPORT_HXX_
-#define _RTFEXPORT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORT_HXX
#include "wrtww8.hxx"
@@ -189,6 +189,6 @@ private:
RtfRedlineTbl m_aRedlineTbl;
};
-#endif // _RTFEXPORT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 212adb2a6a43..33552c232150 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTFEXPORTFILTER_HXX_
-#define _RTFEXPORTFILTER_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORTFILTER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORTFILTER_HXX
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XExporter.hpp>
@@ -71,6 +71,6 @@ OUString RtfExport_getImplementationName();
#define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport"
-#endif // _RTFEXPORTFILTER_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_RTFEXPORTFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 2e8d2dd52fe7..c2e82d99d7ef 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RTFSDREXPORT_HXX_
-#define _RTFSDREXPORT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFSDREXPORT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFSDREXPORT_HXX
#include <filter/msfilter/escherex.hxx>
#include <editeng/outlobj.hxx>
@@ -99,6 +99,6 @@ private:
void impl_writeGraphic();
};
-#endif // _RTFSDREXPORT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_RTFSDREXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx
index d02a56d91109..fbf4423fb11d 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.hxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.hxx
@@ -6,8 +6,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _RTFSTRINGBUFFER_HXX_
-#define _RTFSTRINGBUFFER_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFSTRINGBUFFER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFSTRINGBUFFER_HXX
#include <rtl/strbuf.hxx>
#include <vector>
@@ -60,6 +60,6 @@ private:
Values_t m_aValues;
};
-#endif // _RTFSTRINGBUFFER_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_RTFSTRINGBUFFER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 5f975a7ba524..928c3cb267a6 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef WW_SORTEDARRAY_HXX
-#define WW_SORTEDARRAY_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX
#include <algorithm>
diff --git a/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx
index f62157c147d8..274b5ee08da2 100644
--- a/sw/source/filter/ww8/staticassert.hxx
+++ b/sw/source/filter/ww8/staticassert.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef WW_STATICASSERT_HXX
-#define WW_STATICASSERT_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_STATICASSERT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_STATICASSERT_HXX
/*
Lifted direct from:
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 2993fff3386a..5944cfe05101 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WRTWW8_HXX
-#define _WRTWW8_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
#include <tools/solar.h>
#include <tools/gen.hxx>
@@ -1582,6 +1582,6 @@ public:
void setIPat(sal_uInt16 ipat) { m_ipat = ipat; }
};
-#endif // _WRTWW8_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 2fc8dbda526c..1a3f14bd0b00 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8ATTRIBUTEOUTPUT_HXX_
-#define _WW8ATTRIBUTEOUTPUT_HXX_
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8ATTRIBUTEOUTPUT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8ATTRIBUTEOUTPUT_HXX
#include "attributeoutputbase.hxx"
#include "wrtww8.hxx"
@@ -462,6 +462,6 @@ protected:
};
-#endif // _WW8ATTRIBUTEOUTPUT_HXX_
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WW8ATTRIBUTEOUTPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 1764ce4cd63b..d6c35fad8656 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8GLSY_HXX
-#define _WW8GLSY_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8GLSY_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8GLSY_HXX
#include <sot/storage.hxx>
#include "ww8scan.hxx"
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index fc3c8c9147e0..565e51f1abc3 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8GRAF_HXX
-#define _WW8GRAF_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8GRAF_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8GRAF_HXX
#include <vector>
#include <stack>
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index ead9ef3e7f99..917ac7abd99e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8PAR_HXX
-#define _WW8PAR_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR_HXX
#include "rtl/ustring.hxx"
#include <filter/msfilter/msdffimp.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 99342b30f805..e44b01344c92 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8PAR2_HXX
-#define _WW8PAR2_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8PAR2_HXX
#include <swtypes.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 4f7e06e92bd5..a6fbd4a1c6db 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8SCAN_HXX
-#define _WW8SCAN_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8SCAN_HXX
#ifndef LONG_MAX
#include <limits.h>
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 285cec926248..7f1b08bca4fc 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WW8STRUC_HXX
-#define _WW8STRUC_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8STRUC_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8STRUC_HXX
#include <osl/endian.h>
#include "rtl/ustring.hxx"
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index c9a0d2b41ecf..74e726a5256f 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.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 _WW8TOOLBAR_HXX
-#define _WW8TOOLBAR_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8TOOLBAR_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8TOOLBAR_HXX
#include <filter/msfilter/mstoolbar.hxx>
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 24f2517232d4..0b562bcaa9ac 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.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 _XMLREDLINEIMPORTHELPER_HXX
-#define _XMLREDLINEIMPORTHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLREDLINEIMPORTHELPER_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLREDLINEIMPORTHELPER_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 779b9aec5c0c..8a8f8d0f3906 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.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 _WRTXML_HXX
-#define _WRTXML_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -92,6 +92,6 @@ private:
};
-#endif // _WRTXML_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx
index d8d282a20a32..4ca96faaa13f 100644
--- a/sw/source/filter/xml/xmlbrshe.hxx
+++ b/sw/source/filter/xml/xmlbrshe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLBRSHE_HXX
-#define _XMLBRSHE_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX
#include <rtl/ustring.hxx>
#include <xmloff/attrlist.hxx>
@@ -44,6 +44,6 @@ public:
};
-#endif // _XMLBRSHE_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 37bf44b20da2..f862558fc0c6 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_XMLBRSHI_HXX
-#define SW_XMLBRSHI_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHI_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHI_HXX
#include <com/sun/star/io/XOutputStream.hpp>
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index a30bb1d74f74..0fa8c6bdbafb 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLEXP_HXX
-#define _XMLEXP_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX
#include <xmloff/xmlexp.hxx>
#include "xmlitmap.hxx"
@@ -158,6 +158,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const
}
-#endif // _XMLEXP_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index b76f087a427b..16ff8283db34 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLITMPR_HXX
-#define _XMLITMPR_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
#include <tools/solar.h>
#include "xmlitmap.hxx"
@@ -123,6 +123,6 @@ SvXMLExportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
mrMapEntries = rMapEntries;
}
-#endif // _XMLITMPR_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 76738e0d65d3..91f2fe5f10a9 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_XMLIMP_HXX
-#define SW_XMLIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLIMP_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLIMP_HXX
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index ec8a2a8c36c4..219ae8dba848 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.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 _XMLIMPIT_HXX
-#define _XMLIMPIT_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
#include <limits.h>
#include <tools/solar.h>
@@ -92,6 +92,6 @@ SvXMLImportItemMapper::getMapEntries() const
}
-#endif // _XMLIMPIT_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 6c199b9453a2..2573ce8a10f8 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLITEM_HXX
-#define _XMLITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <tools/solar.h>
@@ -67,6 +67,6 @@ public:
};
-#endif // _XMLITEM_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index 821887085135..7abab391bd2e 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_XMLITHLP_HXX
-#define _SW_XMLITHLP_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLITHLP_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLITHLP_HXX
#include <sal/types.h>
#include <xmloff/xmlement.hxx>
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 2c0ced4e90fc..2fd6fdc9dc6b 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLITMAP_HXX
-#define _XMLITMAP_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX
#include <sal/types.h>
#include <tools/ref.hxx>
@@ -84,6 +84,6 @@ SV_DECL_REF( SvXMLItemMapEntries )
SV_IMPL_REF( SvXMLItemMapEntries )
-#endif // _XMLITMAP_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 79016dcc2748..3423eea0ceb7 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLTBLI_HXX
-#define _XMLTBLI_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLTBLI_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLTBLI_HXX
#include <xmloff/XMLTextTableContext.hxx>
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 7cceb4a8e880..2ea2d650f514 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XMLTEXTE_HXX
-#define _XMLTEXTE_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
#include <xmloff/txtparae.hxx>
#include <tools/globname.hxx>
@@ -77,6 +77,6 @@ public:
};
-#endif // _XMLTEXTE_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 4e30e16d2168..2c31210d13a9 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.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 _XMLTEXTI_HXX
-#define _XMLTEXTI_HXX
+#ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX
+#define INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX
#include <xmloff/txtimp.hxx>
@@ -117,6 +117,6 @@ public:
const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
};
-#endif // _XMLTEXTI_HXX
+#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/swdllimpl.hxx b/sw/source/ui/app/swdllimpl.hxx
index 02be4a6425d7..b51ab6b49ca2 100644
--- a/sw/source/ui/app/swdllimpl.hxx
+++ b/sw/source/ui/app/swdllimpl.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SWDLL_IMPL_INCLUDE
-#define SWDLL_IMPL_INCLUDE
+#ifndef INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
+#define INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
#include "sal/config.h"
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 0fddfde7e608..c9d8cf152956 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.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 _ADDRESSLISTDIALOG_HXX
-#define _ADDRESSLISTDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 0eecf58cc6f8..8d42ff46bd1b 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.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 _CREATEADDRESSLISTDIALOG_HXX
-#define _CREATEADDRESSLISTDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_CREATEADDRESSLISTDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_CREATEADDRESSLISTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index dfcadc2c658d..e3dec814fe0b 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.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 _CUSTOMIZEADDRESSLISTDIALOG_HXX
-#define _CUSTOMIZEADDRESSLISTDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_CUSTOMIZEADDRESSLISTDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_CUSTOMIZEADDRESSLISTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index 826a9fd78604..bbbac8fab7e9 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.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 _DBTABLEPREVIEWDIALOG_HXX
-#define _DBTABLEPREVIEWDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_DBTABLEPREVIEWDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_DBTABLEPREVIEWDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 4e7f9aba939d..40dfe88038dc 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.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 _MAILMERGEADDRESSBLOCKPAGE_HXX
-#define _MAILMERGEADDRESSBLOCKPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMADDRESSBLOCKPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMADDRESSBLOCKPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index a10064ba8642..41c0df0f9c98 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.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 _MAILMERGEDOCSELECTPAGE_HXX
-#define _MAILMERGEDOCSELECTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <mailmergehelper.hxx>
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 8a4b6cd395e4..f5216a8a86b7 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.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 _MAILMERGEGREETINGSPAGE_HXX
-#define _MAILMERGEGREETINGSPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 1e6e7a2127ef..3ff1f0d3d21c 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.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 _MAILMERGELAYOUTPAGE_HXX
-#define _MAILMERGELAYOUTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <mailmergehelper.hxx>
diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx
index f8235292a32f..3c6e9b6c6e06 100644
--- a/sw/source/ui/dbui/mmmergepage.hxx
+++ b/sw/source/ui/dbui/mmmergepage.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 _MAILMERGEMERGEPAGE_HXX
-#define _MAILMERGEMERGEPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMMERGEPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMMERGEPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index ddcdb70eab94..8a8c3baf92db 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.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 _MAILMERGEOUTPUTPAGE_HXX
-#define _MAILMERGEOUTPUTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <vcl/button.hxx>
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 2aeab3be346b..81769f2b6863 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.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 _MAILMERGEOUTPUTTYPEPAGE_HXX
-#define _MAILMERGEOUTPUTTYPEPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx
index c4bb4429dc06..4a89e6c04f7c 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.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 _MAILMERGEPREPAREMERGEPAGE_HXX
-#define _MAILMERGEPREPAREMERGEPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMPREPAREMERGEPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_MMPREPAREMERGEPAGE_HXX
#include <svtools/wizardmachine.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index 573697163bee..06188dd6eb12 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.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 _SELECTDBTABLEDIALOG_HXX
-#define _SELECTDBTABLEDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DBUI_SELECTDBTABLEDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_DBUI_SELECTDBTABLEDIALOG_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 09d59637ffcf..de45486a1645 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.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 _SW_DLGFACT_HXX
-#define _SW_DLGFACT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DIALOG_SWDLGFACT_HXX
+#define INCLUDED_SW_SOURCE_UI_DIALOG_SWDLGFACT_HXX
#include "swabstdlg.hxx"
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.hxx b/sw/source/ui/docvw/AnchorOverlayObject.hxx
index 13dce8615b37..7c86e1abe013 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/ui/docvw/AnchorOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ANCHOROVERLAYOBJECT_HXX
-#define _ANCHOROVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_ANCHOROVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.hxx b/sw/source/ui/docvw/AnnotationMenuButton.hxx
index 7c92edfdddbd..c1334e8e077b 100644
--- a/sw/source/ui/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/ui/docvw/AnnotationMenuButton.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ANNOTATIONMENUBUTTON_HXX
-#define _ANNOTATIONMENUBUTTON_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_ANNOTATIONMENUBUTTON_HXX
#include <vcl/menubtn.hxx>
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.hxx b/sw/source/ui/docvw/ShadowOverlayObject.hxx
index d0fe0d89dd16..d692ec86a75b 100644
--- a/sw/source/ui/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/ui/docvw/ShadowOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SHADOWOVERLAYOBJECT_HXX
-#define _SHADOWOVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_SHADOWOVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index 157c2120e75b..37829b290a5a 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARTXTCONTROL_HXX
-#define _SIDEBARTXTCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROL_HXX
#include <vcl/ctrl.hxx>
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.hxx b/sw/source/ui/docvw/SidebarTxtControlAcc.hxx
index 861bfe9f81a5..051c5ecd7758 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARTXTCONTROLACC_HXX
-#define _SIDEBARTXTCONTROLACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROLACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/ui/docvw/SidebarWinAcc.hxx b/sw/source/ui/docvw/SidebarWinAcc.hxx
index cd09fb3542ad..c86516d5ce99 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.hxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARWINACC_HXX
-#define _SIDEBARWINACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARWINACC_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARWINACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.hxx b/sw/source/ui/docvw/frmsidebarwincontainer.hxx
index be7c012aedcb..51e657a551e1 100644
--- a/sw/source/ui/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/ui/docvw/frmsidebarwincontainer.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 _FRMSIDEBARWINCONTAINER_HXX
-#define _FRMSIDEBARWINCONTAINER_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_FRMSIDEBARWINCONTAINER_HXX
#include <sal/types.h>
#include <vector>
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 3cb1d569771c..ba20764b1306 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.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 _ROMENU_HXX
-#define _ROMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_ROMENU_HXX
+#define INCLUDED_SW_SOURCE_UI_DOCVW_ROMENU_HXX
#include <vcl/graph.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index d86944077b8e..a71c710a02b5 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.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 _ENVFMT_HXX
-#define _ENVFMT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
#include <svtools/stdctrl.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 70dc8df10cc3..32d4defdad6c 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ENVPRT_HXX
-#define _ENVPRT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 4813936a2433..eb6f3eb7304b 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.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 _LABFMT_HXX
-#define _LABFMT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HXX
#include "swuilabimp.hxx"
#include "labimg.hxx"
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx
index 3bca6ef4fade..bef8f983fb68 100644
--- a/sw/source/ui/envelp/labimp.hxx
+++ b/sw/source/ui/envelp/labimp.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 _LABIMP_HXX
-#define _LABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 33d950b56e8e..0132db7f26cd 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.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 _LABPRT_HXX
-#define _LABPRT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABPRT_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_LABPRT_HXX
#include <vcl/button.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 367e11a42622..3a8b10b19726 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.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 _SWUILABIMP_HXX
-#define _SWUILABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
+#define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
#include "labimp.hxx"
#include <com/sun/star/text/XAutoTextContainer2.hpp>
#include <vcl/layout.hxx>
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index 7cb80be1c6ba..e26f5fd037ef 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.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 _FLDREFTREELISTBOX_HXX
-#define _FLDREFTREELISTBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDREFTREELISTBOX_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDREFTREELISTBOX_HXX
#include <svtools/treelistbox.hxx>
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 5655f628315d..8ccfe3bea86d 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.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 _SWFLDDB_HXX
-#define _SWFLDDB_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDDB_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDB_HXX
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 188c321e3af5..cd37f9366c2a 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.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 _SWFLDDINF_HXX
-#define _SWFLDDINF_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDDINF_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDINF_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 832087233bac..39f016842f63 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.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 _SWFLDDOK_HXX
-#define _SWFLDDOK_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDDOK_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDOK_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 5ce663d1867c..9f38cefc784c 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.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 _SWFLDFUNC_HXX
-#define _SWFLDFUNC_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDFUNC_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDFUNC_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 4a19c3c9c07d..226a3f8d8e6c 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.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 _SWFLDPAGE_HXX
-#define _SWFLDPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDPAGE_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDPAGE_HXX
#include <sfx2/tabdlg.hxx>
#include <fldmgr.hxx>
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 99dbd964d7b2..fb88d16f5dcc 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.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 _SWFLDREF_HXX
-#define _SWFLDREF_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDREF_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDREF_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 588b8a044887..5b97b6ba43ed 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.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 _SWFLDVAR_HXX
-#define _SWFLDVAR_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDVAR_HXX
+#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDVAR_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/DashedLine.hxx b/sw/source/ui/inc/DashedLine.hxx
index b7bc9ab9b10d..14ea2ef2507d 100644
--- a/sw/source/ui/inc/DashedLine.hxx
+++ b/sw/source/ui/inc/DashedLine.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 _DASHEDLINE_HXX
-#define _DASHEDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_DASHEDLINE_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_DASHEDLINE_HXX
#include <basegfx/color/bcolor.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx
index cbc717785943..48ee686e8fe6 100644
--- a/sw/source/ui/inc/DropDownFieldDialog.hxx
+++ b/sw/source/ui/inc/DropDownFieldDialog.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 _SW_DROPDOWNFIELDDIALOG_HXX
-#define _SW_DROPDOWNFIELDDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_DROPDOWNFIELDDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_DROPDOWNFIELDDIALOG_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/FrameControl.hxx b/sw/source/ui/inc/FrameControl.hxx
index d704801ee3e4..f976efbb31c5 100644
--- a/sw/source/ui/inc/FrameControl.hxx
+++ b/sw/source/ui/inc/FrameControl.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 _FRAMECONTROL_HXX
-#define _FRAMECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROL_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROL_HXX
class SwEditWin;
class SwFrm;
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx b/sw/source/ui/inc/FrameControlsManager.hxx
index e86d110b7581..a9824c953b60 100644
--- a/sw/source/ui/inc/FrameControlsManager.hxx
+++ b/sw/source/ui/inc/FrameControlsManager.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 _FRAMECONTROLSMANAGER_HXX
-#define _FRAMECONTROLSMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROLSMANAGER_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROLSMANAGER_HXX
#include <viewsh.hxx>
#include <FrameControl.hxx>
diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/ui/inc/HeaderFooterWin.hxx
index 4983630380cb..945d02de07e6 100644
--- a/sw/source/ui/inc/HeaderFooterWin.hxx
+++ b/sw/source/ui/inc/HeaderFooterWin.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 _HEADERFOOTERWINDOW_HXX
-#define _HEADERFOOTERWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_HEADERFOOTERWIN_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_HEADERFOOTERWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/ui/inc/PageBreakWin.hxx b/sw/source/ui/inc/PageBreakWin.hxx
index 7c550af3c929..9e9ed283b182 100644
--- a/sw/source/ui/inc/PageBreakWin.hxx
+++ b/sw/source/ui/inc/PageBreakWin.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 _PAGEBREAKWINDOW_HXX
-#define _PAGEBREAKWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_PAGEBREAKWIN_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_PAGEBREAKWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/ui/inc/SidebarWindowsConsts.hxx b/sw/source/ui/inc/SidebarWindowsConsts.hxx
index f9099d40e0a5..c2ed68276da5 100644
--- a/sw/source/ui/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/ui/inc/SidebarWindowsConsts.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SIDEBARWINDOWSCONSTS_HXX
-#define _SIDEBARWINDOWSCONSTS_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_SIDEBARWINDOWSCONSTS_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_SIDEBARWINDOWSCONSTS_HXX
namespace sw { namespace sidebarwindows {
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
index b4653b943b7b..922841304721 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_SPELL_DIALOG_CHILD_WINDOW_HXX
-#define SW_SPELL_DIALOG_CHILD_WINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_SWSPELLDIALOGCHILDWINDOW_HXX
#include <svx/SpellDialogChildWindow.hxx>
#include <view.hxx>
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx
index c220de09e4ea..73def3835d2c 100644
--- a/sw/source/ui/inc/SwXFilterOptions.hxx
+++ b/sw/source/ui/inc/SwXFilterOptions.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 _SWXFILTEROPTIONS_HXX
-#define _SWXFILTEROPTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_SWXFILTEROPTIONS_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_SWXFILTEROPTIONS_HXX
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx
index e69cd1fed502..e6c80037e57b 100644
--- a/sw/source/ui/inc/abstract.hxx
+++ b/sw/source/ui/inc/abstract.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 _ABSTRACT_HXX
-#define _ABSTRACT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_ABSTRACT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_ABSTRACT_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index 24ca330d9c4c..d69a29e0631f 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.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 _ACTCTRL_HXX
-#define _ACTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_ACTCTRL_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_ACTCTRL_HXX
#include <vcl/field.hxx>
#include "swdllapi.h"
diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx
index 509a979c970a..14a1f0d9929f 100644
--- a/sw/source/ui/inc/addrdlg.hxx
+++ b/sw/source/ui/inc/addrdlg.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 _ADDRDLG_HXX
-#define _ADDRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_ADDRDLG_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_ADDRDLG_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx
index 5a30273ab36d..5872c956d239 100644
--- a/sw/source/ui/inc/annotsh.hxx
+++ b/sw/source/ui/inc/annotsh.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 _SWANNOTSH_HXX
-#define _SWANNOTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_ANNOTSH_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_ANNOTSH_HXX
#include <sfx2/shell.hxx>
#include "shellid.hxx"
diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx
index 2972bdfc92a8..faf18d8b3347 100644
--- a/sw/source/ui/inc/ascfldlg.hxx
+++ b/sw/source/ui/inc/ascfldlg.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 _ASCFLDLG_HXX
-#define _ASCFLDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_ASCFLDLG_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_ASCFLDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx
index 78488723bc93..385f0d952567 100644
--- a/sw/source/ui/inc/autoedit.hxx
+++ b/sw/source/ui/inc/autoedit.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 _AUTOEDIT_HXX
-#define _AUTOEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_AUTOEDIT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_AUTOEDIT_HXX
#include <vcl/edit.hxx>
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx
index 75adc8ca0c8d..f0e05c11dde9 100644
--- a/sw/source/ui/inc/barcfg.hxx
+++ b/sw/source/ui/inc/barcfg.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 SW_BARCFG_HXX
-#define SW_BARCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BARCFG_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BARCFG_HXX
#include <unotools/configitem.hxx>
class SwToolbarConfigItem : public utl::ConfigItem
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx
index 33800a7041af..bc2e4e5a028b 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/ui/inc/basesh.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 _SWBASESH_HXX
-#define _SWBASESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BASESH_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BASESH_HXX
#include <shellid.hxx>
diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/ui/inc/beziersh.hxx
index 45ebce177679..c957d083d1f8 100644
--- a/sw/source/ui/inc/beziersh.hxx
+++ b/sw/source/ui/inc/beziersh.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 _SWBEZIERSH_HXX
-#define _SWBEZIERSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BEZIERSH_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BEZIERSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx
index 63926031162c..dcf59bb97efb 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/ui/inc/bmpwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BMPWIN_HXX
-#define _BMPWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BMPWIN_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BMPWIN_HXX
#include <vcl/graph.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx
index 8749c311d90e..42ad20fa6218 100644
--- a/sw/source/ui/inc/bookctrl.hxx
+++ b/sw/source/ui/inc/bookctrl.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 _BOOKCTRL_HXX
-#define _BOOKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BOOKCTRL_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BOOKCTRL_HXX
#include <rtl/ustring.hxx>
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 1b0c10bbd706..cc6a19bc4cf1 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.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 _BOOKMARK_HXX
-#define _BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BOOKMARK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx
index 98b0db845bb0..00933a759b4f 100644
--- a/sw/source/ui/inc/break.hxx
+++ b/sw/source/ui/inc/break.hxx
@@ -17,8 +17,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 _BREAK_HXX
-#define _BREAK_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_BREAK_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_BREAK_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx
index 133a43c2a3ca..89d369689dec 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/ui/inc/caption.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 _CAPTION_HXX
-#define _CAPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CAPTION_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CAPTION_HXX
#include <rtl/ustring.hxx>
#include <tools/globname.hxx>
diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h
index 058d82ad4566..20f652978fe1 100644
--- a/sw/source/ui/inc/cfgid.h
+++ b/sw/source/ui/inc/cfgid.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 _CFGID_H
-#define _CFGID_H
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CFGID_H
+#define INCLUDED_SW_SOURCE_UI_INC_CFGID_H
#include <sfx2/sfx.hrc>
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 7a94547f5cfc..2f96386b5ce5 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.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 _CFGITEMS_HXX
-#define _CFGITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CFGITEMS_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CFGITEMS_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index 85b99df8abe5..ea8e127a4b57 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.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 _CHANGEDB_HXX
-#define _CHANGEDB_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX
#include <vcl/bitmap.hxx>
diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx
index 663f001361fe..e2402197c8eb 100644
--- a/sw/source/ui/inc/chartins.hxx
+++ b/sw/source/ui/inc/chartins.hxx
@@ -16,13 +16,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CHARTINS_HXX
-#define _CHARTINS_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX
Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart );
void SwInsertChart( Window *pParent, SfxBindings *pBindings );
-#endif /*_CHARTINS_HXX*/
+#endif // INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx
index 344965dd4c04..bec1c65438ee 100644
--- a/sw/source/ui/inc/chldwrap.hxx
+++ b/sw/source/ui/inc/chldwrap.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 _CHLDWRAP_HXX
-#define _CHLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CHLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CHLDWRAP_HXX
#include <sfx2/childwin.hxx>
#include <vcl/timer.hxx>
diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx
index 21ddaec31684..4b13eb2b8a3b 100644
--- a/sw/source/ui/inc/chrdlg.hxx
+++ b/sw/source/ui/inc/chrdlg.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 _SWCHARDLG_HXX
-#define _SWCHARDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CHRDLG_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CHRDLG_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/ui/inc/chrdlgmodes.hxx b/sw/source/ui/inc/chrdlgmodes.hxx
index d60ff0f33696..bc7d6a2be8d0 100644
--- a/sw/source/ui/inc/chrdlgmodes.hxx
+++ b/sw/source/ui/inc/chrdlgmodes.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SW_CHAR_DLG_MODES_HXX
-#define SW_CHAR_DLG_MODES_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CHRDLGMODES_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CHRDLGMODES_HXX
// DialogModes for SwCharDlg
#define DLG_CHAR_STD 0
@@ -16,6 +16,6 @@
#define DLG_CHAR_ENV 2
#define DLG_CHAR_ANN 3
-#endif // SW_CHAR_DLG_MODES_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CHRDLGMODES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index 30dc8e13663a..83c2a605b56a 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.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 _CNTTAB_HXX
-#define _CNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CNTTAB_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CNTTAB_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx
index 9caeec1cb8d6..748cc8db0396 100644
--- a/sw/source/ui/inc/colex.hxx
+++ b/sw/source/ui/inc/colex.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 _COLEX_HXX
-#define _COLEX_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX
#include <svx/pagectrl.hxx>
#include <editeng/paperinf.hxx>
@@ -104,6 +104,6 @@ public:
virtual Size GetOptimalSize() const;
};
-#endif // _COLEX_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx
index 98690bcbe49e..c69fb5c2b1a7 100644
--- a/sw/source/ui/inc/colmgr.hxx
+++ b/sw/source/ui/inc/colmgr.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 _COLMGR_HXX
-#define _COLMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_COLMGR_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_COLMGR_HXX
#include "swdllapi.h"
#include <fmtclds.hxx>
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index e50a5d94b7c5..004b34d0dfb1 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _COLUMN_HXX
-#define _COLUMN_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx
index e36deb4e3c9e..9eb6fa87f3da 100644
--- a/sw/source/ui/inc/conarc.hxx
+++ b/sw/source/ui/inc/conarc.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 _CONARC_HXX
-#define _CONARC_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
#include "drawbase.hxx"
@@ -45,6 +45,6 @@ public:
-#endif // _CONARC_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx
index fce123ab5e9b..f358bf1ba768 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/ui/inc/condedit.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 _CONDEDTI_HXX
-#define _CONDEDTI_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONDEDIT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONDEDIT_HXX
#include <vcl/edit.hxx>
#include <svtools/transfer.hxx>
diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx
index 1f3e3eb00869..11adb4f045bf 100644
--- a/sw/source/ui/inc/conform.hxx
+++ b/sw/source/ui/inc/conform.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 _CONFORM_HXX
-#define _CONFORM_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONFORM_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONFORM_HXX
#include "drawbase.hxx"
diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx
index cab2bc7a0bd9..48066efde70d 100644
--- a/sw/source/ui/inc/conpoly.hxx
+++ b/sw/source/ui/inc/conpoly.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 _CONPOLY_HXX
-#define _CONPOLY_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
#include "drawbase.hxx"
@@ -43,6 +43,6 @@ public:
};
-#endif // _CONPOLY_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx
index f382d73668de..9811f9e1215e 100644
--- a/sw/source/ui/inc/conrect.hxx
+++ b/sw/source/ui/inc/conrect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_CONRECT_HXX
-#define _SW_CONRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
#include "drawbase.hxx"
@@ -48,6 +48,6 @@ class ConstRectangle : public SwDrawBase
-#endif // _SW_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index c0cc6fdced44..b10f5eb6439f 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.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 _CONTTREE_HXX
-#