summaryrefslogtreecommitdiff
path: root/cui/inc
diff options
context:
space:
mode:
authorGeorge Bateman <george.bateman16@gmail.com>2020-09-13 11:59:43 +0000
committerJulien Nabet <serval2412@yahoo.fr>2020-09-13 15:32:59 +0200
commitf93f4c10e6e976009606ecc7bb3b8a02afd80fb0 (patch)
treee9fdaaf7dfc93401554140cdf9db14d01e2598ef /cui/inc
parent0743a75a9fd3ef60489154e4ffc706f9dae82399 (diff)
tdf#124176 Use #pragma once in cui
This commit was carried out by a Python script, source of which is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97. Change-Id: Ia0099ecd621f008e497260f26e5754d55d0f09aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102549 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'cui/inc')
-rw-r--r--cui/inc/bitmaps.hlst5
-rw-r--r--cui/inc/numcategories.hrc5
-rw-r--r--cui/inc/strings.hrc4
-rw-r--r--cui/inc/strings.hxx5
-rw-r--r--cui/inc/tipoftheday.hrc5
-rw-r--r--cui/inc/treeopt.hrc5
-rw-r--r--cui/inc/twolines.hrc5
7 files changed, 7 insertions, 27 deletions
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 94d6227acb82..3c0faced780b 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CUI_INC_BITMAPS_HRC
-#define INCLUDED_CUI_INC_BITMAPS_HRC
+#pragma once
#define RID_SVXBMP_CELL_NONE "svx/res/pr01.png"
#define RID_SVXBMP_CELL_NONE_32 "svx/res/border_cell_none_32.png"
@@ -78,6 +77,4 @@
#define RID_SVXBMP_COMPONENT "res/component_16.png"
#define RID_SVXBMP_MACRO "svx/res/id018.png"
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/inc/numcategories.hrc b/cui/inc/numcategories.hrc
index be72fce77ff1..73d25da4f079 100644
--- a/cui/inc/numcategories.hrc
+++ b/cui/inc/numcategories.hrc
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CUI_INC_NUM_CATEGORIES_HRC
-#define INCLUDED_CUI_INC_NUM_CATEGORIES_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -27,6 +26,4 @@ const char* NUM_CATEGORIES[] =
NC_("numberingformatpage|liststore1", "Text")
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 92f5b665c7ee..fb43379f1d8b 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -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_CUI_INC_STRINGS_HRC
-#define INCLUDED_CUI_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -400,6 +399,5 @@
#define RID_SVXSTR_ADDITIONS_SEARCHING NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
#define RID_SVXSTR_ADDITIONS_LOADING NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/strings.hxx b/cui/inc/strings.hxx
index 76d7f06fa0b3..616a5daa6bcb 100644
--- a/cui/inc/strings.hxx
+++ b/cui/inc/strings.hxx
@@ -7,11 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CUI_INC_STRINGS_HXX
-#define INCLUDED_CUI_INC_STRINGS_HXX
+#pragma once
#define RID_SVXSTR_KEY_BASIC_PATH "BASIC"
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 15c23a398908..74de677d2b32 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CUI_INC_TIPOFTHEDAY_HRC
-#define INCLUDED_CUI_INC_TIPOFTHEDAY_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -278,6 +277,4 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
#define STR_Option NC_("STR_CTRL", "⌥ Opt") //use narrow no-break space U+202F here
-#endif //INCLUDED_CUI_INC_TIPOFTHEDAY_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index ffbfaa5e5e4b..64894a91a5da 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CUI_INC_TREEOPT_HRC
-#define INCLUDED_CUI_INC_TREEOPT_HRC
+#pragma once
#include <sal/types.h>
#include <sfx2/pageids.hxx>
@@ -156,6 +155,4 @@ const std::pair<const char*, sal_uInt16> SID_SB_STARBASEOPTIONS_RES[] =
{ NC_("SID_SB_STARBASEOPTIONS_RES", "Databases"), SID_SB_DBREGISTEROPTIONS }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/twolines.hrc b/cui/inc/twolines.hrc
index 2e63227d25cf..609e05e267d6 100644
--- a/cui/inc/twolines.hrc
+++ b/cui/inc/twolines.hrc
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CUI_INC_TWO_LINES_HRC
-#define INCLUDED_CUI_INC_TWO_LINES_HRC
+#pragma once
#include <sal/types.h>
@@ -43,6 +42,4 @@ const std::pair<const char*, sal_uInt16> TWOLINE_CLOSE[] =
{ NC_("twolinespage|liststore2", "Other Characters..."), CHRDLG_ENCLOSE_SPECIAL_CHAR }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */