[Libreoffice-commits] core.git: include/sfx2 sc/inc test/source
Efdal Ä°ncesu (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jan 25 17:58:47 UTC 2020
include/sfx2/checkin.hxx | 6 ++----
sc/inc/calcmacros.hxx | 5 +----
sc/inc/columnset.hxx | 5 +----
sc/inc/strings.hxx | 4 +---
test/source/isheadless.hxx | 5 +----
5 files changed, 6 insertions(+), 19 deletions(-)
New commits:
commit 99c5669b4f54a3e55625ec0896852ed4154d2765
Author: Efdal İncesu <efdal_incesu at hotmail.com>
AuthorDate: Sat Jan 25 16:24:28 2020 +0300
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Jan 25 18:58:16 2020 +0100
tdf#124176: Use pragma once instead of include guard
Change-Id: Ic525a57880067fc589346b87237c08fae4644ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87403
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx
index 680160cedd97..78535f7aab9d 100644
--- a/include/sfx2/checkin.hxx
+++ b/include/sfx2/checkin.hxx
@@ -6,8 +6,8 @@
* 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 INCLUDED_SFX2_CHECKIN_HXX
-#define INCLUDED_SFX2_CHECKIN_HXX
+
+#pragma once
#include <vcl/weld.hxx>
@@ -28,6 +28,4 @@ public:
bool IsMajor() const;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/calcmacros.hxx b/sc/inc/calcmacros.hxx
index ca51c62adb54..c0c68d4487cf 100644
--- a/sc/inc/calcmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SC_INC_CALCMACROS_HXX
-#define INCLUDED_SC_INC_CALCMACROS_HXX
+#pragma once
#define DEBUG_COLUMN_STORAGE 0
#define DEBUG_PIVOT_TABLE 0
@@ -35,6 +34,4 @@ using std::cerr;
using std::endl;
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index 879c9098b9d6..d7d9a4de5ec6 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SC_INC_COLUMNSET_HXX
-#define INCLUDED_SC_INC_COLUMNSET_HXX
+#pragma once
#include "types.hxx"
@@ -36,6 +35,4 @@ public:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/strings.hxx b/sc/inc/strings.hxx
index dcd76c281aa9..f21fccf77b6a 100644
--- a/sc/inc/strings.hxx
+++ b/sc/inc/strings.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SC_INC_STRINGS_HXX
-#define INCLUDED_SC_INC_STRINGS_HXX
+#pragma once
#define SCSTR_FIELDSEP ",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 "
#define SCSTR_TEXTSEP "\"\t34\t'\t39"
@@ -23,6 +22,5 @@
#define STR_ACC_RIGHTAREA_DESCR ""
#define STR_ACC_HEADER_DESCR ""
#define STR_ACC_FOOTER_DESCR ""
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/isheadless.hxx b/test/source/isheadless.hxx
index 8a3e81e6ee72..c9f22232bd15 100644
--- a/test/source/isheadless.hxx
+++ b/test/source/isheadless.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
-#define INCLUDED_TEST_SOURCE_ISHEADLESS_HXX
+#pragma once
#include <sal/config.h>
@@ -32,6 +31,4 @@ inline bool isHeadless() {
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list