sw/inc/accmap.hxx | 4 +---
sw/inc/acmplwrd.hxx | 5 +----
sw/inc/anchoreddrawobject.hxx | 5 +----
sw/inc/anchoredobject.hxx | 5 +----
sw/inc/authfld.hxx | 5 +----
sw/inc/authratr.hxx | 5 +----
sw/inc/breakit.hxx | 5 +----
sw/inc/calc.hxx | 5 +----
sw/inc/ccoll.hxx | 5 +----
sw/inc/cellatr.hxx | 5 +----
sw/inc/cellfml.hxx | 5 +----
sw/inc/charatr.hxx | 5 +----
sw/inc/charfmt.hxx | 5 +----
13 files changed, 13 insertions(+), 51 deletions(-)
New commits:
commit cf39ee6cbfed2ec6e82c136712910bf3f4954bdf
Author: JaxkDev <jaxk...@gmail.com>
AuthorDate: Wed Oct 23 16:52:14 2024 +0100
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Fri Oct 25 13:45:31 2024 +0200
tdf#143148 Use #pragma once instead of include guards
Few more files converted to #pragma once convention, plenty more in sw/inc
(~150)
Change-Id: I5f5a2604f0fe879a6318e5d174653057a53f9af2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175511
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index d99d8dc16c7a..bf9969e37461 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.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_ACCMAP_HXX
-#define INCLUDED_SW_INC_ACCMAP_HXX
+#pragma once
#include <cppuhelper/weakref.hxx>
#include <rtl/ref.hxx>
@@ -303,6 +302,5 @@ private:
public:
virtual bool IsDocumentSelAll() override;
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 935a92076ef9..56b60236c953 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_ACMPLWRD_HXX
-#define INCLUDED_SW_INC_ACMPLWRD_HXX
+#pragma once
#include <deque>
#include <memory>
@@ -73,6 +72,4 @@ public:
bool GetWordsMatching(std::u16string_view aMatch, std::vector<OUString>&
aWords) const;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index bfc40fe07a3c..482b5d6dd28d 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.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_ANCHOREDDRAWOBJECT_HXX
-#define INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX
+#pragma once
#include "anchoredobject.hxx"
#include <optional>
@@ -164,6 +163,4 @@ class SwAnchoredDrawObject final : public SwAnchoredObject
virtual const char* getElementName( ) const override { return
"SwAnchoredDrawObject"; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 837d25dcb77d..7d06010f2f1c 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.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_ANCHOREDOBJECT_HXX
-#define INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
+#pragma once
#include "swtypes.hxx"
#include "swrect.hxx"
@@ -515,6 +514,4 @@ class SwObjPositioningInProgress
~SwObjPositioningInProgress();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 6996f5090b68..ab1d87f74a8b 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.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_AUTHFLD_HXX
-#define INCLUDED_SW_INC_AUTHFLD_HXX
+#pragma once
#include <sal/config.h>
@@ -240,6 +239,4 @@ inline void SwAuthEntry::SetAuthorField(ToxAuthorityField
ePos, const OUString&
m_aAuthFields[ePos] = rField;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 2c68369215d1..62ae6de0b79d 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_AUTHRATR_HXX
-#define INCLUDED_SW_INC_AUTHRATR_HXX
+#pragma once
#include <tools/color.hxx>
#include "swdllapi.h"
@@ -39,6 +38,4 @@ public:
}
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index d21fb85bce45..64e63aa3a8e2 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_BREAKIT_HXX
-#define INCLUDED_SW_INC_BREAKIT_HXX
+#pragma once
#include <memory>
#include <optional>
@@ -124,6 +123,4 @@ public:
// @@@ backward compatibility @@@
SW_DLLPUBLIC extern SwBreakIt* g_pBreakIt;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 9aa00ec0225c..ff9fde612ece 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_CALC_HXX
-#define INCLUDED_SW_INC_CALC_HXX
+#pragma once
#include <memory>
#include <vector>
@@ -216,6 +215,4 @@ public:
OUString* pValidName = nullptr );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 4052d4f0afdd..5c9d1f8b9c71 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.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_CCOLL_HXX
-#define INCLUDED_SW_INC_CCOLL_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
@@ -62,6 +61,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 54ddf2caa5ba..854f755636bd 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_CELLATR_HXX
-#define INCLUDED_SW_INC_CELLATR_HXX
+#pragma once
#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
@@ -127,6 +126,4 @@ inline const SwTableBoxFormula
&SwFormat::GetTableBoxFormula(bool bInP) c
inline const SwTableBoxValue &SwFormat::GetTableBoxValue(bool bInP)
const
{ return m_aSet.GetTableBoxValue(bInP); }
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 7f71a161baae..a4f6bb2e5366 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_INC_CELLFML_HXX
-#define INCLUDED_SW_INC_CELLFML_HXX
+#pragma once
#include "swdllapi.h"
@@ -148,6 +147,4 @@ public:
static sal_uInt16 GetLnPosInTable( const SwTable& rTable, const
SwTableBox* pBox );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 0e97a27abff2..9b16277e284e 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.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_CHARATR_HXX
-#define INCLUDED_SW_INC_CHARATR_HXX
+#pragma once
#include "format.hxx"
#include "hintids.hxx"
@@ -128,6 +127,4 @@ inline const SvxFontItem &SwFormat::GetCTLFont(bool
bInP) const
inline const SvxColorItem &SwFormat::GetColor(bool bInP) const
{ return m_aSet.GetColor(bInP); }
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index ac29a29aa84e..166db1d708fc 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.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_CHARFMT_HXX
-#define INCLUDED_SW_INC_CHARFMT_HXX
+#pragma once
#include "format.hxx"
#include "hintids.hxx"
@@ -56,6 +55,4 @@ namespace CharFormat
extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr
*pAttr );
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
