diff options
author | Vincent LE GARREC <libreoffice@le-garrec.fr> | 2021-03-06 08:21:49 +0100 |
---|---|---|
committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2021-03-23 13:07:09 +0100 |
commit | 90c978f839e5029c69b4acb70f37909ee3016614 (patch) | |
tree | ac5c8cd53cf72ddc2336d53ab3f4b40661e30091 /formula | |
parent | 88eb9f73ff32ed5a2cf696de9e076e7dfee36d8d (diff) |
tdf#124176 Use pragma once in f*
filter, forms, fpicker, framework
Change-Id: I55a25ad2dc3749e63465e638e8eeea3c322eabbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112047
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'formula')
-rw-r--r-- | formula/inc/bitmaps.hlst | 5 | ||||
-rw-r--r-- | formula/inc/core_resource.hrc | 5 | ||||
-rw-r--r-- | formula/inc/strings.hrc | 5 | ||||
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 5 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 5 |
7 files changed, 7 insertions, 26 deletions
diff --git a/formula/inc/bitmaps.hlst b/formula/inc/bitmaps.hlst index 10984f7a77c1..811354b21f5a 100644 --- a/formula/inc/bitmaps.hlst +++ b/formula/inc/bitmaps.hlst @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FORMULA_INC_BITMAPS_HRC -#define INCLUDED_FORMULA_INC_BITMAPS_HRC +#pragma once #define BMP_STR_CLOSE "formula/res/fapclose.png" #define BMP_STR_OPEN "formula/res/fapopen.png" @@ -18,6 +17,4 @@ #define RID_BMP_REFBTN2 "formula/res/refinp2.png" #define BMP_FX "formula/res/fx.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc index cf1cca33373f..01520f582b1b 100644 --- a/formula/inc/core_resource.hrc +++ b/formula/inc/core_resource.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC -#define INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC +#pragma once #include <formula/compiler.hxx> #include <utility> @@ -2746,6 +2745,4 @@ const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_SYMBOLS[] = { nullptr, -1 } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/inc/strings.hrc b/formula/inc/strings.hrc index 154daca73ea1..a54a2f259b95 100644 --- a/formula/inc/strings.hrc +++ b/formula/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_STRINGS_HRC -#define INCLUDED_VCL_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -31,6 +30,4 @@ #define RID_STR_SHRINK NC_("RID_STR_SHRINK", "Shrink") #define RID_STR_EXPAND NC_("RID_STR_EXPAND", "Expand") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 613e40c5e9c7..2495474516ce 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.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_FORMULA_SOURCE_UI_DLG_CONTROLHELPER_HXX -#define INCLUDED_FORMULA_SOURCE_UI_DLG_CONTROLHELPER_HXX +#pragma once #include <formula/funcutl.hxx> @@ -103,6 +102,5 @@ public: }; } -#endif // FORMULA_FORMULA_HELPER_HXX_INCLUDED /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 319ee7c8ad2c..6254dfc8a6a7 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX -#define INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX +#pragma once #include <vcl/weld.hxx> #include <vector> @@ -84,6 +83,5 @@ public: }; } // formula -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index cff5c0a5f087..db3a02a89ee6 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX -#define INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX +#pragma once #include <formula/funcutl.hxx> #include <vcl/weld.hxx> @@ -143,6 +142,4 @@ public: } // formula -#endif // INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 935b321d0443..11640318990f 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX -#define INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX +#pragma once #include <vcl/weld.hxx> @@ -72,6 +71,4 @@ public: } // formula -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |