sw/inc/IShellCursorSupplier.hxx | 5 +----
sw/inc/PageColumnPopup.hxx | 5 +----
sw/inc/PageMarginPopup.hxx | 5 +----
sw/inc/PageOrientationPopup.hxx | 5 +----
sw/inc/PageSizePopup.hxx | 5 +----
sw/inc/PostItMgr.hxx | 6 +-----
sw/inc/SwAppletImpl.hxx | 5 +----
sw/inc/SwCapConfigProp.hxx | 5 +----
sw/inc/SwCapObjType.hxx | 5 +----
sw/inc/SwDocIdle.hxx | 5 +----
sw/inc/SwGetPoolIdFromName.hxx | 5 +----
sw/inc/SwNodeNum.hxx | 6 +-----
sw/inc/SwNumberTreeTypes.hxx | 6 +-----
sw/inc/SwRewriter.hxx | 6 +-----
sw/inc/SwSmartTagMgr.hxx | 6 +-----
sw/inc/SwStyleNameMapper.hxx | 4 +---
sw/inc/SwUndoField.hxx | 5 +----
sw/inc/SwXMLSectionList.hxx | 5 +----
sw/inc/ToxLinkProcessor.hxx | 6 +-----
sw/inc/ToxTabStopTokenHandler.hxx | 6 +-----
sw/inc/ToxTextGenerator.hxx | 5 +----
sw/inc/ToxWhitespaceStripper.hxx | 5 ++---
sw/inc/UndoParagraphSignature.hxx | 5 +----
23 files changed, 24 insertions(+), 97 deletions(-)
New commits:
commit 80e8375828ac09fdb5a127b7690848075e37aa9c
Author: Oromidayo Owolabi <owolabioromiday...@gmail.com>
AuthorDate: Sat Oct 19 11:12:33 2024 +0100
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Wed Oct 23 09:06:10 2024 +0200
tdf#143148 Use #pragma once instead of include guards
Replace include guards to pragma once in some header files in sw/inc/
Change-Id: I8e790a89ab2326748590d7a1ff2d1daee0ae0f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175191
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx
index ec945f24d3b4..10e7b83ea130 100644
--- a/sw/inc/IShellCursorSupplier.hxx
+++ b/sw/inc/IShellCursorSupplier.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
-#define INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
+#pragma once
class SwCursor;
@@ -38,6 +37,4 @@ public:
} // namespace sw
-#endif // INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index 6d50daa1576a..ff193a321fee 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_PAGECOLUMNPOPUP_HXX
-#define INCLUDED_SW_INC_PAGECOLUMNPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -38,6 +37,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index ddfb7049f037..6999bcc36e05 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX
-#define INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -38,6 +37,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index 9f50ffdacd60..2e60dbbdb07e 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_PAGEORIENTATIONPOPUP_HXX
-#define INCLUDED_SW_INC_PAGEORIENTATIONPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -38,6 +37,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index 3eb4088c2af9..65eb144a4bc3 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_PAGESIZEPOPUP_HXX
-#define INCLUDED_SW_INC_PAGESIZEPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -38,6 +37,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index dec8cec70764..8c25f381641b 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_POSTITMGR_HXX
-#define INCLUDED_SW_INC_POSTITMGR_HXX
+#pragma once
#include <sal/config.h>
#include "swdllapi.h"
@@ -256,6 +254,4 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener,
sw::sidebarwindows::SidebarPosition GetSidebarPos(const Point&
rPointLogic);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index ea30a104ce69..13409e337305 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_SWAPPLETIMPL_HXX
-#define INCLUDED_SW_INC_SWAPPLETIMPL_HXX
+#pragma once
#include <config_java.h>
@@ -62,6 +60,5 @@ public:
const OUString& GetAltText() const { return m_sAlt; }
void SetAltText( const OUString& rAlt ) {m_sAlt = rAlt;}
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwCapConfigProp.hxx b/sw/inc/SwCapConfigProp.hxx
index 20257f3d9716..9a317b199750 100644
--- a/sw/inc/SwCapConfigProp.hxx
+++ b/sw/inc/SwCapConfigProp.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWCAPCONFIGPROP_HXX
-#define INCLUDED_SW_INC_SWCAPCONFIGPROP_HXX
+#pragma once
enum CapConfigProp
{
@@ -33,6 +32,4 @@ enum CapConfigProp
PROP_CAP_OBJECT_APPLYATTRIBUTES, //9
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwCapObjType.hxx b/sw/inc/SwCapObjType.hxx
index 729e1a7b2f66..bab5b39888fd 100644
--- a/sw/inc/SwCapObjType.hxx
+++ b/sw/inc/SwCapObjType.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWCAPOBJTYPE_HXX
-#define INCLUDED_SW_INC_SWCAPOBJTYPE_HXX
+#pragma once
enum SwCapObjType
{
@@ -27,6 +26,4 @@ enum SwCapObjType
OLE_CAP
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx
index 2eeeee1c9870..4d573b748a85 100644
--- a/sw/inc/SwDocIdle.hxx
+++ b/sw/inc/SwDocIdle.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWDOCIDLE_HXX
-#define INCLUDED_SW_INC_SWDOCIDLE_HXX
+#pragma once
#include <vcl/idle.hxx>
@@ -46,6 +45,4 @@ public:
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 6d66616dd0c4..1f46af93661f 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWGETPOOLIDFROMNAME_HXX
-#define INCLUDED_SW_INC_SWGETPOOLIDFROMNAME_HXX
+#pragma once
#include <sal/types.h>
@@ -35,6 +34,4 @@ enum class SwGetPoolIdFromName : sal_uInt16
CellStyle = 0x40
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 2aff25d306ba..c0faf2e514aa 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_SWNODENUM_HXX
-#define INCLUDED_SW_INC_SWNODENUM_HXX
+#pragma once
#include "SwNumberTree.hxx"
@@ -96,6 +94,4 @@ private:
virtual void NotifyNode() override;
};
-#endif // INCLUDED_SW_INC_SWNODENUM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTreeTypes.hxx b/sw/inc/SwNumberTreeTypes.hxx
index 505802edf291..ff04dd268958 100644
--- a/sw/inc/SwNumberTreeTypes.hxx
+++ b/sw/inc/SwNumberTreeTypes.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
-#define INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
+#pragma once
#include <tools/long.hxx>
#include <vector>
@@ -29,6 +27,4 @@ typedef tools::Long tSwNumTreeNumber;
typedef std::vector<tSwNumTreeNumber> tNumberVector;
}
-#endif // INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index a0ab5e371342..e41a076568ba 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_SWREWRITER_HXX
-#define INCLUDED_SW_INC_SWREWRITER_HXX
+#pragma once
#include <vector>
#include <rtl/ustring.hxx>
@@ -47,6 +45,4 @@ public:
static OUString GetPlaceHolder(SwUndoArg eId);
};
-#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 f1c254f93e45..6dd8fb020506 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_SW_INC_SWSMARTTAGMGR_HXX
-#define INCLUDED_SW_INC_SWSMARTTAGMGR_HXX
+#pragma once
#include <svx/SmartTagMgr.hxx>
#include <rtl/ref.hxx>
@@ -42,6 +40,4 @@ public:
virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent&
Event) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 139f09c974db..0fdfb381711a 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWSTYLENAMEMAPPER_HXX
-#define INCLUDED_SW_INC_SWSTYLENAMEMAPPER_HXX
+#pragma once
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -153,6 +152,5 @@ public:
static const std::vector<OUString>& GetTableStyleProgNameArray();
static const std::vector<OUString>& GetCellStyleProgNameArray();
};
-#endif // _NAME_MAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index dcdc57b0b9bd..fc82fe12fa71 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWUNDOFIELD_HXX
-#define INCLUDED_SW_INC_SWUNDOFIELD_HXX
+#pragma once
#include "undobj.hxx"
@@ -80,6 +79,4 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
};
-#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 e05eeb3a6be1..4bea922cf42f 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_SWXMLSECTIONLIST_HXX
-#define INCLUDED_SW_INC_SWXMLSECTIONLIST_HXX
+#pragma once
#include <xmloff/xmlimp.hxx>
@@ -37,6 +36,4 @@ private:
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index b0c708fb6519..967e658d4970 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -6,9 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
-#ifndef SW_TOXLINKPROCESSOR_HXX_
-#define SW_TOXLINKPROCESSOR_HXX_
+#pragma once
#include "fmtinfmt.hxx"
#include <rtl/ustring.hxx>
@@ -91,6 +89,4 @@ private:
}
-#endif /* SW_TOXLINKPROCESSOR_HXX_ */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx
b/sw/inc/ToxTabStopTokenHandler.hxx
index 29d634c67914..23a7d720682c 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -7,9 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
-#ifndef TOXTABSTOPTOKENHANDLER_HXX_
-#define TOXTABSTOPTOKENHANDLER_HXX_
+#pragma once
#include <rtl/ustring.hxx>
@@ -115,6 +113,4 @@ private:
}
-#endif /* TOXTABSTOPTOKENHANDLER_HXX_ */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 105aa9eb0660..11ba9488716a 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SW_TOXTEXTGENERATOR_HXX_
-#define SW_TOXTEXTGENERATOR_HXX_
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -171,6 +170,4 @@ private:
}
-#endif /* SW_TOXTEXTGENERATOR_HXX_ */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 755c3f721af2..0d6cbb113cbf 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef TOXWHITESPACESTRIPPER_HXX_
-#define TOXWHITESPACESTRIPPER_HXX_
+#pragma once
#include <rtl/ustring.hxx>
#include <vector>
@@ -44,4 +43,4 @@ private:
} // end namespace sw
-#endif /* TOXWHITESPACESTRIPPER_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/UndoParagraphSignature.hxx
b/sw/inc/UndoParagraphSignature.hxx
index 4fe5640a6193..0a8dc07b7da7 100644
--- a/sw/inc/UndoParagraphSignature.hxx
+++ b/sw/inc/UndoParagraphSignature.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_UNDOPARAGRAPHSIGNATURE_HXX
-#define INCLUDED_SW_INC_UNDOPARAGRAPHSIGNATURE_HXX
+#pragma once
#include "undobj.hxx"
#include <rtl/ustring.hxx>
@@ -61,6 +60,4 @@ private:
void Remove();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
