[Libreoffice-commits] core.git: editeng/inc package/inc sal/textenc sc/inc sw/inc

[Burak Bala (via logerrit)]

 editeng/inc/editeng.hxx             |    6 ++----
 package/inc/ZipEnumeration.hxx      |    5 ++---
 sal/textenc/gettextencodingdata.hxx |    5 +----
 sc/inc/scresid.hxx                  |    5 +----
 sw/inc/SwNumberTree.hxx             |    5 +----
 5 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 47c598260a8f07cf3a1e4cab061df3f2d261932c
Author:     Burak Bala <burak.bala at ogr.sakarya.edu.tr>
AuthorDate: Sat Jan 25 16:35:42 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Jan 26 20:47:13 2020 +0100

    tdf#124176: Use pragma once instead of include guards
    
    Change-Id: Ib2465f040f12413560b2cec1c742cf3558461309
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87404
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/editeng/inc/editeng.hxx b/editeng/inc/editeng.hxx
index 6c59982d679e..cce3d79d4e10 100644
--- a/editeng/inc/editeng.hxx
+++ b/editeng/inc/editeng.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_EDITENG_INC_EDITENG_HXX
-#define INCLUDED_EDITENG_INC_EDITENG_HXX
+
+#pragma once
 
 #define MN_WORDLANGUAGE  998
 #define MN_PARALANGUAGE  999
@@ -25,6 +25,4 @@
 #define MN_AUTOSTART    2000
 #define MN_DICTSTART    3000
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index 07e8a5848617..cc4156a0ee52 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.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_PACKAGE_INC_ZIPENUMERATION_HXX
-#define INCLUDED_PACKAGE_INC_ZIPENUMERATION_HXX
+
+#pragma once
 
 #include "HashMaps.hxx"
 
@@ -31,6 +31,5 @@ public:
     ZipEnumeration( EntryHash &rNewEntryHash );
     ~ZipEnumeration();
 };
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/gettextencodingdata.hxx b/sal/textenc/gettextencodingdata.hxx
index 22bd9c2fed75..88f22be36424 100644
--- a/sal/textenc/gettextencodingdata.hxx
+++ b/sal/textenc/gettextencodingdata.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SAL_TEXTENC_GETTEXTENCODINGDATA_HXX
-#define INCLUDED_SAL_TEXTENC_GETTEXTENCODINGDATA_HXX
+#pragma once
 
 #include <sal/config.h>
 
@@ -29,6 +28,4 @@
 ImplTextEncodingData const *
 Impl_getTextEncodingData(rtl_TextEncoding nEncoding);
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index a9b7f2798a6d..0be9da0ff5b6 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SC_INC_SCRESID_HXX
-#define INCLUDED_SC_INC_SCRESID_HXX
+#pragma once
 
 #include <rtl/ustring.hxx>
 #include "scdllapi.h"
@@ -26,6 +25,4 @@
 OUString SC_DLLPUBLIC ScResId(const char* pId);
 OUString ScResId(const char* pId, int nCardinality);
 
-#endif // SC_SCRESMGR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index ad3ffe845110..9323d3df5644 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_INC_SWNUMBERTREE_HXX
-#define INCLUDED_SW_INC_SWNUMBERTREE_HXX
+#pragma once
 
 #include <set>
 #include <vector>
@@ -602,6 +601,4 @@ protected:
 
 };
 
-#endif // INCLUDED_SW_INC_SWNUMBERTREE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */