[Libreoffice-commits] core.git: comphelper/source

George Bateman (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 4 06:32:06 UTC 2020


 comphelper/source/misc/instancelocker.hxx                         |    5 +----
 comphelper/source/misc/officerestartmanager.hxx                   |    5 +----
 comphelper/source/officeinstdir/officeinstallationdirectories.hxx |    5 +----
 comphelper/source/property/opropertybag.hxx                       |    5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 88da6b7b62dc0c391e28a920bb2d355bce89f8bf
Author:     George Bateman <george.bateman16 at gmail.com>
AuthorDate: Wed Aug 5 15:41:27 2020 +0000
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Sep 4 08:31:25 2020 +0200

    tdf#124176 Use #pragma once in comphelper
    
    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: I72229dc1ef743f0394f778aec7c49c11fe7e5176
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100183
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index ff5cee4f4775..02180e511c0f 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_SOURCE_MISC_INSTANCELOCKER_HXX
-#define INCLUDED_COMPHELPER_SOURCE_MISC_INSTANCELOCKER_HXX
+#pragma once
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
@@ -110,6 +109,4 @@ public:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index 865fc29b23b3..c473bfae4bec 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_SOURCE_MISC_OFFICERESTARTMANAGER_HXX
-#define INCLUDED_COMPHELPER_SOURCE_MISC_OFFICERESTARTMANAGER_HXX
+#pragma once
 
 #include <com/sun/star/task/XRestartManager.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -63,6 +62,4 @@ public:
 
 } // namespace comphelper
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index def6dcbd7e35..f39f8a380e91 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX
-#define INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX
+#pragma once
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -78,6 +77,4 @@ private:
 
 } // namespace comphelper
 
-#endif /* ! INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX */
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 57ff26b8142e..73957e51a39f 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_SOURCE_PROPERTY_OPROPERTYBAG_HXX
-#define INCLUDED_COMPHELPER_SOURCE_PROPERTY_OPROPERTYBAG_HXX
+#pragma once
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -216,6 +215,4 @@ namespace comphelper
 } // namespace comphelper
 
 
-#endif // INCLUDED_COMPHELPER_SOURCE_PROPERTY_OPROPERTYBAG_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list