summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-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
259 files changed, 596 insertions, 596 deletions
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>