[Libreoffice-commits] core.git: sw/source

Bartu Bayazıt (via logerrit) logerrit at kemper.freedesktop.org
Sat Nov 28 13:04:34 UTC 2020


 sw/source/core/inc/txtfly.hxx    |    6 ++----
 sw/source/core/inc/txttypes.hxx  |    6 ++----
 sw/source/core/text/redlnitr.hxx |    6 ++----
 sw/source/core/text/txtcache.hxx |    6 ++----
 sw/source/core/text/txtpaint.hxx |    7 +++----
 5 files changed, 11 insertions(+), 20 deletions(-)

New commits:
commit 2e93e2c83b3fba9d29783dc4cc9782e142d8a58f
Author:     Bartu Bayazıt <bartubayazit81 at gmail.com>
AuthorDate: Fri Nov 27 20:41:49 2020 +0000
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Nov 28 14:03:58 2020 +0100

    tdf#124176: Use pragma once instead of include guards
    
    Change-Id: I2f583dd1c0a6b8a546d83bbf852eb0ef5492c374
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106790
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index f6d5f8f50dd2..6d6b14f18c34 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
+
+#pragma once
 
 #include <editeng/txtrange.hxx>
 #include <tools/solar.h>
@@ -373,6 +373,4 @@ inline void SwTextFly::SetIgnoreObjsInHeaderFooter( const bool bNew )
     mbIgnoreObjsInHeaderFooter = bNew;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 16f433e3b0b2..96972212c02e 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
+
+#pragma once
 
 /// @see PORGRP_* masks in porlin.hxx for meaning of bits!
 enum class PortionType
@@ -88,6 +88,4 @@ enum class PortionType
     TabLeft     = 0x0740,
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 84c3dd0d7980..cfd8514cae54 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
-#define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
+
+#pragma once
 
 #include <docary.hxx>
 #include <swfont.hxx>
@@ -131,6 +131,4 @@ public:
     }
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 192fb42ee20f..158f997ff10c 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
-#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
+
+#pragma once
 
 #include <swcache.hxx>
 #include "porlay.hxx"
@@ -59,6 +59,4 @@ public:
     bool IsAvailable() const;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 0c8e0466b906..f6e21ab121be 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -16,8 +16,9 @@
  *   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_TEXT_TXTPAINT_HXX
-#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTPAINT_HXX
+
+#pragma once
+
 #include <vcl/outdev.hxx>
 
 class SwRect;               // SwSaveClip
@@ -122,6 +123,4 @@ inline DbgRect::DbgRect( OutputDevice* pOutDev, const tools::Rectangle &rRect,
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list