sw/source/core/inc/UndoTable.hxx | 5 +----
sw/source/core/inc/unoevent.hxx | 6 ++----
sw/source/core/inc/unofield.hxx | 5 +----
sw/source/core/inc/unoflatpara.hxx | 5 +----
sw/source/core/inc/unofldmid.h | 6 ++----
sw/source/core/inc/unofootnote.hxx | 5 +----
sw/source/core/inc/unoidx.hxx | 6 ++----
sw/source/core/inc/unolinebreak.hxx | 5 +----
sw/source/core/inc/unometa.hxx | 5 +----
sw/source/core/inc/unoparaframeenum.hxx | 5 +----
sw/source/core/inc/unoport.hxx | 6 ++----
sw/source/core/inc/unorefmark.hxx | 5 +----
sw/source/core/inc/unosection.hxx | 5 +----
sw/source/core/inc/unotextmarkup.hxx | 5 +----
sw/source/core/inc/viewimp.hxx | 5 ++---
sw/source/core/inc/visiturl.hxx | 5 +----
sw/source/core/inc/wrong.hxx | 5 +----
17 files changed, 22 insertions(+), 67 deletions(-)
New commits:
commit b117f7d42c7c8bce12d61c01b92b8af4e9aa70b1
Author: Jonah Janzen <jonah.jan...@gmail.com>
AuthorDate: Wed Mar 6 19:40:14 2024 -0700
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Mar 7 19:13:48 2024 +0100
tdf#143148 Use #pragma once instead of include guards
Uses #pragma once in several files under sw/source/core/inc.
Change-Id: I3052462232665a4efa301afd51e9f64fa3567c44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164517
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 29850d2f07e2..40d4d0547b6a 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
+#pragma once
#include <o3tl/deleter.hxx>
#include <tools/long.hxx>
@@ -424,6 +423,4 @@ public:
virtual SwRewriter GetRewriter() const override;
};
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 4906f447f685..ddf7b0713770 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
+
+#pragma once
#include <svtools/unoevent.hxx>
@@ -90,6 +90,4 @@ private:
virtual sal_uInt16 getMacroItemWhich() const override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 313185a0001b..3224db126fca 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
@@ -224,6 +223,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoflatpara.hxx
b/sw/source/core/inc/unoflatpara.hxx
index 9fd768d277a9..30631fabae6a 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
@@ -133,6 +132,4 @@ private:
SwNodeOffset mnEndNode; // used for non-automatic mode
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 8c1838f45636..b0ae0cea1644 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
+
+#pragma once
// mapping of the properties on the descriptor
#define FIELD_PROP_PAR1 10
@@ -53,6 +53,4 @@
#define FIELD_PROP_USHORT3 38
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofootnote.hxx
b/sw/source/core/inc/unofootnote.hxx
index 23f22bee2cd3..a7498a730749 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -131,6 +130,4 @@ public:
const ::css::uno::Reference< ::css::text::XTextRange >&
aTextPosition ) override;
};
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index 30eca1011a1d..89bdfc390bfe 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
+
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -209,6 +209,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unolinebreak.hxx
b/sw/source/core/inc/unolinebreak.hxx
index 700f35e3fff3..46794f96b393 100644
--- a/sw/source/core/inc/unolinebreak.hxx
+++ b/sw/source/core/inc/unolinebreak.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOLINEBREAK_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOLINEBREAK_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -81,6 +80,4 @@ public:
removeEventListener(const css::uno::Reference<css::lang::XEventListener>&
xListener) override;
};
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOLINEBREAK_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index c2e4f4c30f8a..91108eb464ac 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
+#pragma once
#include <memory>
#include <deque>
@@ -260,6 +259,4 @@ void getPrefixAndSuffix(
const css::uno::Reference< css::rdf::XMetadatable>& xMetaField,
OUString *const o_pPrefix, OUString *const o_pSuffix, OUString *const
o_pShadowColor);
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoparaframeenum.hxx
b/sw/source/core/inc/unoparaframeenum.hxx
index c44e0f660c6d..c5a49e02084c 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
+#pragma once
#include <deque>
@@ -74,6 +73,4 @@ struct SwXParaFrameEnumeration
css::uno::Reference<css::text::XTextContent>
FrameClientToXTextContent(sw::FrameClient* pClient);
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index d932622a1138..ec05eb1c038f 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
+
+#pragma once
#include <memory>
#include <deque>
@@ -310,6 +310,4 @@ public:
const OUString& rPropertyName) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unorefmark.hxx
b/sw/source/core/inc/unorefmark.hxx
index 6d5535973c48..1d4ad9acec04 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -103,6 +102,4 @@ public:
};
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unosection.hxx
b/sw/source/core/inc/unosection.hxx
index 7527a2f11088..ec235f03dfae 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -150,6 +149,4 @@ public:
};
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unotextmarkup.hxx
b/sw/source/core/inc/unotextmarkup.hxx
index 4475bafdac15..3f2a7d447c6a 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
@@ -98,6 +97,4 @@ private:
std::map< OUString, css::uno::Any > maMap;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 4c659f349262..fad62cbdc36a 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
+
+#pragma once
#include <tools/color.hxx>
#include <svx/svdtypes.hxx>
@@ -311,6 +311,5 @@ inline void SwViewShellImp::AddAccessibleObj( const
SdrObject *pObj )
SwRect aEmptyRect;
MoveAccessible( nullptr, pObj, aEmptyRect );
}
-#endif // INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index f273f33bb7f4..a883a2279124 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
+#pragma once
#include <svl/lstner.hxx>
@@ -35,6 +34,4 @@ public:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index d4bef9d26df1..993677270ea8 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
+#pragma once
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XStringKeyMap.hpp>
@@ -408,6 +407,4 @@ public:
} // namespace sw
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
