[Libreoffice-commits] core.git: include/LibreOfficeKit include/registry include/rtl include/sfx2 include/svx

[iakarsu (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKit.hxx |    5 +----
 include/registry/registry.hxx             |    6 +-----
 include/rtl/strbuf.hxx                    |    6 +-----
 include/sfx2/sfxbasemodel.hxx             |    5 +----
 include/svx/msdffdef.hxx                  |    5 +----
 5 files changed, 5 insertions(+), 22 deletions(-)

New commits:
commit 9accb3c4b5e1861d9a03c655242da5b629f5a6d6
Author:     iakarsu <iakarsu99 at gmail.com>
AuthorDate: Sat Jan 25 16:21:43 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Jan 26 20:27:42 2020 +0100

    tdf#124176: Use pragma once instead of include guards
    
    Change-Id: I6a7f7711fa931657dd97c9c0bc1bdce671b69b7d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87405
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 19f0b2663552..28a603e02203 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
-#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
+#pragma once
 
 #include <cstddef>
 
@@ -972,6 +971,4 @@ inline Office* lok_cpp_init(const char* pInstallPath, const char* pUserProfileUr
 
 }
 
-#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 9e264f4a30bd..c71e7dc804c4 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REGISTRY_HXX
-#define INCLUDED_REGISTRY_REGISTRY_HXX
+#pragma once
 
 #include <registry/regdllapi.h>
 #include <registry/regtype.h>
@@ -1055,7 +1054,4 @@ inline RegError Registry::mergeKey(RegistryKey& rKey,
                                          bool bReport)
     {  return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); }
 
-
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 3be06a31e120..780f00dddbb5 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_RTL_STRBUF_HXX
-#define INCLUDED_RTL_STRBUF_HXX
+#pragma once
 
 #include "sal/config.h"
 
@@ -1068,7 +1067,4 @@ typedef rtlunittest::OStringBuffer OStringBuffer;
 using ::rtl::OStringBuffer;
 #endif
 
-#endif // INCLUDED_RTL_STRBUF_HXX
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 7d3be53fd515..3dbdb80c3aff 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SFX2_SFXBASEMODEL_HXX
-#define INCLUDED_SFX2_SFXBASEMODEL_HXX
+#pragma once
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
@@ -745,6 +744,4 @@ private:
 
 } ; // class SfxBaseModel
 
-#endif // INCLUDED_SFX2_SFXBASEMODEL_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index b722e95be8b3..373974e67b31 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_MSDFFDEF_HXX
-#define INCLUDED_SVX_MSDFFDEF_HXX
+#pragma once
 
 #include <limits.h>
 #include <sal/types.h>
@@ -856,6 +855,4 @@ enum MSO_TextGeometryProperties {
 //ALT_TXT_MSINTEROP
 #define MSPROP_DESCRIPTION_MAX_LEN  4096
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */