diff options
| author | George Bateman <george.bateman16@gmail.com> | 2020-09-13 12:12:01 +0000 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-09-13 19:09:54 +0200 |
| commit | dcbe844e291b7efa9ea7eaf280186ce97df075b2 (patch) | |
| tree | 8fb4f984fb1f444612ef756dca2bc0a80bc2a57a /desktop | |
| parent | d4ceea4ca9d9abb47a6f84da138c2918bc7100e0 (diff) | |
tdf#124176 Use #pragma once in desktop
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: I26f01467d2a572a51c7ace76628d4a8f96f249a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102553
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'desktop')
73 files changed, 73 insertions, 290 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 5b388493e0b1..26e4691ab53c 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_APP_HXX -#define INCLUDED_DESKTOP_INC_APP_HXX +#pragma once #include <optional> #include <sal/log.hxx> @@ -178,6 +177,4 @@ OUString ReplaceStringHookProc(const OUString& rStr); } -#endif // INCLUDED_DESKTOP_INC_APP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/bitmaps.hlst b/desktop/inc/bitmaps.hlst index 7a166d5e0807..04c1edd59941 100644 --- a/desktop/inc/bitmaps.hlst +++ b/desktop/inc/bitmaps.hlst @@ -7,14 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_BITMAPS_HRC -#define INCLUDED_DESKTOP_INC_BITMAPS_HRC +#pragma once #define RID_BMP_WARNING "desktop/res/caution_16.png" #define RID_BMP_LOCKED "desktop/res/lock_16.png" #define RID_BMP_SHARED "desktop/res/shared_16.png" #define RID_BMP_EXTENSION "desktop/res/extension_32.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h index 204132210249..2953cd53cfde 100644 --- a/desktop/inc/dp_misc.h +++ b/desktop/inc/dp_misc.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_DP_MISC_H -#define INCLUDED_DESKTOP_INC_DP_MISC_H +#pragma once #include <osl/mutex.hxx> #include <osl/process.h> @@ -150,6 +149,4 @@ void disposeBridges( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_shared.hxx b/desktop/inc/dp_shared.hxx index b4f86e44556f..121bfd430fb5 100644 --- a/desktop/inc/dp_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX +#pragma once #include <rtl/instance.hxx> #include <unotools/resmgr.hxx> @@ -39,6 +38,4 @@ inline OUString DpResId(const char* pId) return Translate::get(pId, dp::DeploymentLocale::get()); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 69dd6103a5bd..a71ecae79f83 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_LIB_INIT_HXX -#define INCLUDED_DESKTOP_INC_LIB_INIT_HXX +#pragma once #include <map> #include <unordered_map> @@ -184,6 +183,4 @@ namespace desktop { DESKTOP_DLLPUBLIC std::vector<com::sun::star::beans::PropertyValue> jsonToPropertyValuesVector(const char* pJSON); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx index e193407236a0..e28b8f9a55d3 100644 --- a/desktop/inc/migration.hxx +++ b/desktop/inc/migration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_MIGRATION_HXX -#define INCLUDED_DESKTOP_INC_MIGRATION_HXX +#pragma once namespace desktop { @@ -28,6 +27,5 @@ public: static void migrateSettingsIfNecessary(); }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc index 3953c73ff60b..dd263a54c163 100644 --- a/desktop/inc/strings.hrc +++ b/desktop/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) @@ -191,6 +190,4 @@ "If this does not apply, delete the lock file at:") #define RID_STR_UNOPKG_ERROR NC_("RID_STR_UNOPKG_ERROR", "ERROR: ") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx index f89a3028cafe..54b668b1b803 100644 --- a/desktop/inc/strings.hxx +++ b/desktop/inc/strings.hxx @@ -7,11 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_STRINGS_HRC -#define INCLUDED_DESKTOP_INC_STRINGS_HRC +#pragma once #define RID_APPTITLE "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 577b50e1af3a..fd9aa8f11380 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEARGS_HXX +#pragma once #include <sal/config.h> @@ -187,6 +186,4 @@ class CommandLineArgs } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx index e1a15360545a..668e93e469a4 100644 --- a/desktop/source/app/cmdlinehelp.hxx +++ b/desktop/source/app/cmdlinehelp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX +#pragma once #include <rtl/ustring.hxx> @@ -28,6 +27,4 @@ namespace desktop void displayVersion(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 2deeb4ba8488..42266a072508 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/XCurrentContext.hpp> @@ -38,6 +37,4 @@ namespace desktop }; } -#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index ca66d33bf8ed..221cac915af3 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/frame/XDispatchResultListener.hpp> @@ -85,6 +84,4 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu } -#endif // INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index ccc19d3a18e8..d469b58bb4f4 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_LANGSELECT_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_LANGSELECT_HXX +#pragma once #include <sal/config.h> @@ -28,6 +27,4 @@ bool prepareLocale(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index e4f3edaf9673..a1de351bc7f5 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX +#pragma once #include <sal/config.h> @@ -154,6 +153,4 @@ class RequestHandlerController : public ::cppu::WeakImplHelper< } -#endif // INCLUDED_DESKTOP_SOURCE_APP_OFFICEIPCTHREAD_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h index c291df7af295..9bc6dafee309 100644 --- a/desktop/source/app/sofficemain.h +++ b/desktop/source/app/sofficemain.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H -#define INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H +#pragma once #include <desktop/dllapi.h> @@ -32,6 +31,4 @@ int DESKTOP_DLLPUBLIC soffice_main(void); } #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx index d0a55df6bf1f..7f1ea920fbe9 100644 --- a/desktop/source/app/updater.hxx +++ b/desktop/source/app/updater.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_UPDATER_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_UPDATER_HXX +#pragma once #include <rtl/ustring.hxx> @@ -35,6 +34,4 @@ public: static void removeUpdateFiles(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx index add45aed9b20..c89be31b84eb 100644 --- a/desktop/source/app/userinstall.hxx +++ b/desktop/source/app/userinstall.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_USERINSTALL_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_USERINSTALL_HXX +#pragma once #include <sal/config.h> @@ -36,6 +35,4 @@ Status finalize(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 713700f44735..cb2932ca4f63 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H +#pragma once namespace dp_gui { @@ -26,6 +25,4 @@ enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; } // namespace dp_gui -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 6b974ae9e9ee..fa0322c5fec0 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DEPENDENCYDIALOG_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DEPENDENCYDIALOG_HXX +#pragma once #include <sal/config.h> @@ -46,6 +45,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 9777742e1b4b..e7e262a3add3 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX +#pragma once #include <vcl/timer.hxx> #include <vcl/idle.hxx> @@ -262,6 +261,4 @@ public: } // namespace dp_gui -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 9bc9b608ed21..debc37db9123 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTENSIONCMDQUEUE_HXX +#pragma once #include <sal/config.h> @@ -98,6 +97,4 @@ void handleInteractionRequest( const css::uno::Reference< css::uno::XComponentCo } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 9295cb09a147..7a1eeb46b443 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX +#pragma once #include <rtl/ustring.hxx> #include <vcl/customweld.hxx> @@ -212,6 +211,4 @@ public: } -#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_EXTLISTBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 8595fb3c87af..914cc15d477c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX +#pragma once #include <cppuhelper/implbase.hxx> @@ -125,6 +124,4 @@ public: } // namespace dp_gui -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index 2edf071df932..a3d82fa61965 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.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_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX +#pragma once #include <sal/config.h> #include <rtl/ustring.hxx> @@ -71,6 +70,4 @@ struct UpdateData }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index dd3ae621a5a5..056b2803261f 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDIALOG_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDIALOG_HXX +#pragma once #include <sal/config.h> @@ -168,6 +167,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 714bb969877f..1acfd85508d2 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEINSTALLDIALOG_HXX +#pragma once #include <sal/config.h> #include <vcl/weld.hxx> @@ -110,6 +109,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index cc9886f24978..63042699e341 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.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_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/awt/XWindow.hpp> @@ -51,6 +50,5 @@ public: virtual sal_Int16 SAL_CALL execute() override; }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index 24c8a86fdc28..1c9872c7858c 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DEPENDENCIES_HXX +#pragma once #include <sal/config.h> @@ -70,6 +69,4 @@ namespace Dependencies { } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 27b857b241ab..9b857746c005 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX +#pragma once #include <sal/config.h> @@ -283,6 +282,4 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DescriptionInfoset getDescriptionInfoset(OUString const & sExtensionFolderURL); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index 5d766d5b21d1..85735c659357 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_IDENTIFIER_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_IDENTIFIER_HXX +#pragma once #include <sal/config.h> @@ -80,6 +79,4 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateLegacyIdentifier( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index a908af3b59d4..645a3a80ba0d 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_INTERACT_H +#pragma once #include <config_options.h> #include <rtl/ref.hxx> @@ -137,6 +136,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx index 0f4d1b469508..ecb07dada37d 100644 --- a/desktop/source/deployment/inc/dp_misc_api.hxx +++ b/desktop/source/deployment/inc/dp_misc_api.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX +#pragma once #include <sal/config.h> #include <sal/types.h> @@ -29,6 +28,4 @@ #define DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_package.hxx b/desktop/source/deployment/inc/dp_package.hxx index cf788c40bd31..f287990f2589 100644 --- a/desktop/source/deployment/inc/dp_package.hxx +++ b/desktop/source/deployment/inc/dp_package.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PACKAGE_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PACKAGE_HXX +#pragma once #include <sal/config.h> @@ -40,6 +39,4 @@ css::uno::Reference<css::deployment::XPackageRegistry> create( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index c42841c83f84..14ef9e30640d 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PERSMAP_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PERSMAP_H +#pragma once #include <rtl/ustring.hxx> #include <osl/file.hxx> @@ -61,6 +60,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index 43c7ad8c594f..1050658c5e2a 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PLATFORM_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_PLATFORM_HXX +#pragma once #include "dp_misc_api.hxx" @@ -43,6 +42,4 @@ bool hasValidPlatform( css::uno::Sequence< OUString > const & platformStrings); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx index d58ec9a59039..76742587ed09 100644 --- a/desktop/source/deployment/inc/dp_registry.hxx +++ b/desktop/source/deployment/inc/dp_registry.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_REGISTRY_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_REGISTRY_HXX +#pragma once #include <sal/config.h> @@ -38,6 +37,4 @@ css::uno::Reference<css::deployment::XPackageRegistry> create( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index f7840819c18e..76f3b8d773a2 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H +#pragma once #include <i18nlangtag/languagetag.hxx> #include "dp_misc_api.hxx" @@ -29,6 +28,4 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag & getOfficeLanguageTag(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index abfad29927ea..291b28b9b972 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H +#pragma once #include <vector> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -92,6 +91,4 @@ bool readProperties( std::vector< std::pair< OUString, OUString> > & out_result, } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index c0e5bb2c0165..8dce9b583729 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UPDATE_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UPDATE_HXX +#pragma once #include <com/sun/star/deployment/XPackage.hpp> @@ -134,6 +133,4 @@ OUString getHighestVersion( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index a74f5fdca3ad..342e2bf8c737 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX +#pragma once #include <sal/config.h> @@ -34,6 +33,4 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Order compareVersions( OUString const & version1, OUString const & version2); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index 1831e2b32169..608073328b38 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H +#pragma once #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> @@ -40,6 +39,4 @@ void xml_parse( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 18a0f1a62803..982a0c2f05fc 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -32,8 +32,7 @@ * */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX +#pragma once #include <rtl/ustring.hxx> @@ -87,6 +86,4 @@ namespace desktop { } -#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 62c169e1ae7a..114a11fbff54 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX +#pragma once #include <config_extensions.h> @@ -92,6 +91,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index 680e1e891149..4251d081bcfd 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -137,6 +136,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 6b82f0092e49..6b3bb13a9ecb 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX +#pragma once #include <strings.hrc> #include <dp_misc.h> @@ -223,6 +222,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 6ec26c9aec3f..335099d3215d 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H +#pragma once #include <dp_misc.h> #include "dp_activepackages.hxx" @@ -230,6 +229,4 @@ inline void PackageManagerImpl::logIntern( css::uno::Any const & status ) } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index 2d72d8cd874f..bc928b8aecf6 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX +#pragma once #include <com/sun/star/beans/NamedValue.hpp> @@ -59,6 +58,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index ab964df2eaf2..e1797056d498 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_COMPONENT_DP_COMPBACKENDDB_HXX +#pragma once #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -91,6 +90,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 70d4d101cabf..aef8a2f0e72c 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_CONFIGURATION_DP_CONFIGURATIONBACKENDDB_HXX +#pragma once #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -71,6 +70,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index f9d553a6d2ee..47c696225074 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_EXECUTABLE_DP_EXECUTABLEBACKENDDB_HXX +#pragma once #include <rtl/ustring.hxx> #include <dp_backenddb.hxx> @@ -55,6 +54,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 4d27a8fceb3c..ad3b414e8113 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_HELP_DP_HELPBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_HELP_DP_HELPBACKENDDB_HXX +#pragma once #include <rtl/ustring.hxx> #include <optional> @@ -69,6 +68,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index d464da4a81a1..74c3b25b1883 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H +#pragma once #include <dp_misc.h> #include <dp_shared.hxx> @@ -284,6 +283,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index ef6d34bfeb3e..7c8d5397fb1d 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> @@ -162,6 +161,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index d084141cd98c..0c81a4b721ff 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_PACKAGE_DP_EXTBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_PACKAGE_DP_EXTBACKENDDB_HXX +#pragma once #include <utility> #include <vector> @@ -64,6 +63,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index f90e26e53ea1..fbbedf8667f3 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_LIB_CONTAINER_H -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_LIB_CONTAINER_H +#pragma once #include <com/sun/star/uno/Reference.hxx> @@ -46,6 +45,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 01ed70c987ba..21d4b1f6b3d5 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_SCRIPTBACKENDDB_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SCRIPT_DP_SCRIPTBACKENDDB_HXX +#pragma once #include <rtl/ustring.hxx> #include <dp_backenddb.hxx> @@ -53,6 +52,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 6683fc546c16..6b5bde8bdd4c 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX +#pragma once #include <cppuhelper/implbase.hxx> @@ -62,6 +61,4 @@ public: -#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/inc/helpids.h b/desktop/source/inc/helpids.h index 6f60038124b4..c95ff76b7886 100644 --- a/desktop/source/inc/helpids.h +++ b/desktop/source/inc/helpids.h @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_HELPIDS_H -#define INCLUDED_DESKTOP_HELPIDS_H +#pragma once #define HID_EXTENSION_MANAGER_LISTBOX_ENABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE" #define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx index 9688956c0ce6..911f38727838 100644 --- a/desktop/source/lib/lokclipboard.hxx +++ b/desktop/source/lib/lokclipboard.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_SOURCE_LIB_LOKCLIPBOARD_HXX -#define INCLUDED_DESKTOP_SOURCE_LIB_LOKCLIPBOARD_HXX +#pragma once #include <vector> @@ -112,6 +111,4 @@ public: static void releaseClipboardForView(int nViewId); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index 8c11fd6b31de..92bc2ffbac8e 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_LIB_LOKINTERACTIONHANDLER_HXX -#define INCLUDED_DESKTOP_SOURCE_LIB_LOKINTERACTIONHANDLER_HXX +#pragma once #include <osl/conditn.hxx> #include <cppuhelper/implbase.hxx> @@ -99,6 +98,4 @@ public: virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index a66c2ea0f113..46bd5d883805 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.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_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX +#pragma once #include <memory> #include <unordered_map> @@ -193,6 +192,4 @@ public: }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 80438223dba4..c25b48ba11ac 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX +#pragma once #include "misc.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -70,6 +69,4 @@ namespace migration } // namespace migration -#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 31c35feb489e..53495c93590e 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX +#pragma once #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -33,6 +32,4 @@ css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames(); } //end blind namespace -#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx index ca1320a2ac5d..c3b83b82e619 100644 --- a/desktop/source/migration/services/misc.hxx +++ b/desktop/source/migration/services/misc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX +#pragma once #include <rtl/ustring.hxx> @@ -37,6 +36,4 @@ namespace migration } // namespace migration -#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index f2aae3b4adbb..586e7e99e3b1 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX +#pragma once #include "misc.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -115,6 +114,4 @@ namespace migration } // namespace migration -#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index b6a7f2d79798..40deda7e5431 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_WORDBOOKMIGRATION_HXX -#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_WORDBOOKMIGRATION_HXX +#pragma once #include "misc.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -71,6 +70,4 @@ namespace migration } // namespace migration -#endif // _DESKTOP_AUTOCORRMIGRATION_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index daa4cc95168f..f09697590a59 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_OFFACC_ACCEPTOR_HXX -#define INCLUDED_DESKTOP_SOURCE_OFFACC_ACCEPTOR_HXX +#pragma once #include <sal/config.h> @@ -93,6 +92,4 @@ public: } //namespace desktop -#endif // INCLUDED_DESKTOP_SOURCE_OFFACC_ACCEPTOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h index bfd9ee69b376..0fcb1013d37a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_main.h +++ b/desktop/source/pkgchk/unopkg/unopkg_main.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H -#define INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H +#pragma once #include <desktop/dllapi.h> @@ -32,6 +31,4 @@ DESKTOP_DLLPUBLIC int unopkg_main(void); } #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index cf822d287c8d..e5de0f678dd8 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX -#define INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX +#pragma once #include <stdio.h> @@ -54,6 +53,4 @@ public: } -#endif // INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/unx/source/file_image.h b/desktop/unx/source/file_image.h index 60fdc8e96a16..6f0194d17ebf 100644 --- a/desktop/unx/source/file_image.h +++ b/desktop/unx/source/file_image.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_UNX_SOURCE_FILE_IMAGE_H -#define INCLUDED_DESKTOP_UNX_SOURCE_FILE_IMAGE_H +#pragma once #ifndef INCLUDED_STDDEF_H #include <stddef.h> @@ -67,6 +66,4 @@ int file_image_close ( } #endif -#endif /* INCLUDED_ODEP_IMAGE_H */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/unx/source/pagein.h b/desktop/unx/source/pagein.h index 308fca530ada..f8820c76c961 100644 --- a/desktop/unx/source/pagein.h +++ b/desktop/unx/source/pagein.h @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_UNX_SOURCE_PAGEIN_H -#define INCLUDED_DESKTOP_UNX_SOURCE_PAGEIN_H +#pragma once #include <sal/config.h> void pagein_execute(char const* path, char const* file); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h index 55c128136dd2..0ca1ba655961 100644 --- a/desktop/unx/source/splashx.h +++ b/desktop/unx/source/splashx.h @@ -6,8 +6,7 @@ * 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_DESKTOP_UNX_SOURCE_SPLASHX_H -#define INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H +#pragma once #include <rtl/ustring.h> @@ -27,6 +26,4 @@ void splash_draw_progress(struct splash* splash, int progress); } // extern "C" #endif -#endif // INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/win32/source/loader.hxx b/desktop/win32/source/loader.hxx index aed76b168798..66b0ed8e53a1 100644 --- a/desktop/win32/source/loader.hxx +++ b/desktop/win32/source/loader.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_WIN32_SOURCE_LOADER_HXX -#define INCLUDED_DESKTOP_WIN32_SOURCE_LOADER_HXX +#pragma once #include <cstddef> #define WIN32_LEAN_AND_MEAN @@ -87,6 +86,4 @@ int unopkgloader_impl(bool bAllowConsole); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |