[Libreoffice-commits] core.git: bridges/inc bridges/source
George Bateman (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 4 07:00:48 UTC 2020
bridges/inc/bridge.hxx | 5 +----
bridges/inc/cppinterfaceproxy.hxx | 5 +----
bridges/inc/except.hxx | 5 +----
bridges/inc/types.hxx | 5 +----
bridges/inc/unointerfaceproxy.hxx | 5 +----
bridges/inc/vtablefactory.hxx | 5 +----
bridges/inc/vtables.hxx | 5 +----
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_ios/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_intel/call.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_mips/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_s390/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx | 5 +----
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx | 5 +----
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx | 5 +----
bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx | 5 +----
bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx | 5 +----
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx | 5 +----
bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx | 4 +---
bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx | 4 +---
bridges/source/cpp_uno/msvc_win32_intel/msci.hxx | 4 +---
bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx | 5 +----
bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx | 4 +---
bridges/source/jni_uno/jni_base.h | 5 +----
bridges/source/jni_uno/jni_bridge.h | 5 +----
bridges/source/jni_uno/jni_helper.h | 5 +----
bridges/source/jni_uno/jni_info.h | 5 +----
bridges/source/jni_uno/jniunoenvironmentdata.hxx | 5 +----
46 files changed, 46 insertions(+), 165 deletions(-)
New commits:
commit 505795db3fa8cd5bb9868ff99f9a8cdf268f4c0b
Author: George Bateman <george.bateman16 at gmail.com>
AuthorDate: Tue Aug 4 21:15:24 2020 +0000
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Sep 4 09:00:08 2020 +0200
tdf#124176 Use #pragma once in bridges
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: Icadf43a74e4ba99e587a1e6287adf8d65f819ca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100144
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index 5229c1d4ad5f..0a6da78859ca 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGE_HXX
+#pragma once
#include <sal/config.h>
@@ -114,6 +113,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index 145886436313..73175d842df1 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
+#pragma once
#include <sal/config.h>
@@ -96,6 +95,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/except.hxx b/bridges/inc/except.hxx
index 4b90ee1e1119..7d7db224f87d 100644
--- a/bridges/inc/except.hxx
+++ b/bridges/inc/except.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX
-#define INCLUDED_BRIDGES_INC_EXCEPT_HXX
+#pragma once
// extern "C" void** __cdecl __current_exception()
// is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp:
@@ -34,6 +33,4 @@
//[...]
extern "C" void** __current_exception();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/types.hxx b/bridges/inc/types.hxx
index 03c24966ba0b..d35529342672 100644
--- a/bridges/inc/types.hxx
+++ b/bridges/inc/types.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_TYPES_HXX
-#define INCLUDED_BRIDGES_INC_TYPES_HXX
+#pragma once
#include <typelib/typeclass.h>
#include <typelib/typedescription.h>
@@ -66,6 +65,4 @@ bool relatesToInterfaceType(typelib_TypeDescription const * type);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index 5b9ad042367d..b00d6ad61366 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
+#pragma once
#include <sal/config.h>
@@ -103,6 +102,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index f64cdd86e1a5..c169f7c0bfd0 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX
-#define INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX
+#pragma once
#include <osl/mutex.hxx>
#include <rtl/alloc.h>
@@ -219,6 +218,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/vtables.hxx b/bridges/inc/vtables.hxx
index 5f6af1a9e3ea..2dc604f0a64f 100644
--- a/bridges/inc/vtables.hxx
+++ b/bridges/inc/vtables.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_INC_VTABLES_HXX
-#define INCLUDED_BRIDGES_INC_VTABLES_HXX
+#pragma once
#include <sal/types.h>
#include <typelib/typedescription.h>
@@ -97,6 +96,4 @@ VtableSlot getVtableSlot(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
index 1d1a757ff857..5d775ea2381c 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_AIX_POWERPC_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_AIX_POWERPC_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -87,5 +86,4 @@ namespace ppc
enum ppclimits { MAX_GPR_REGS = 8, MAX_SSE_REGS = 13 };
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_ios/share.hxx b/bridges/source/cpp_uno/gcc3_ios/share.hxx
index 120c5d5a5563..65461d7fd37f 100644
--- a/bridges/source/cpp_uno/gcc3_ios/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_ios/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -55,5 +54,4 @@ namespace arm
bool return_in_x8( typelib_TypeDescriptionReference *pTypeRef );
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
index 4a677be0219f..d83ecb2ae91f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_AARCH64_ABI_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_AARCH64_ABI_HXX
+#pragma once
#include <sal/config.h>
@@ -155,6 +154,4 @@ ReturnKind getReturnKind(typelib_TypeDescription const * type);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx
index b1b003f413b9..a8b92785f479 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_AARCH64_CALLVIRTUALFUNCTION_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_AARCH64_CALLVIRTUALFUNCTION_HXX
+#pragma once
#include <sal/config.h>
@@ -28,6 +27,4 @@ void callVirtualFunction(
unsigned long function, unsigned long * gpr, unsigned long * fpr,
unsigned long * stack, sal_Int32 sp, void * ret);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
index b66e6377c46e..5e174f6b9965 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ALPHA_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ALPHA_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -85,5 +84,4 @@ namespace axp
enum axplimits { MAX_WORDS_IN_REGS = 6, MAX_GPR_REGS = 6, MAX_SSE_REGS = 6 };
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 0faa612d92fd..284d2b6ffbee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ARM_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_ARM_SHARE_HXX
+#pragma once
#include "sal/config.h"
#include <typeinfo>
@@ -157,6 +156,4 @@ namespace arm
bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
index c2a64c61a11a..ff5b63d79589 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_HPPA_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_HPPA_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -90,5 +89,4 @@ namespace hppa
bool isRegisterReturn( typelib_TypeDescriptionReference *pTypeRef );
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
index 684223f7bf20..5b9ae8c47f60 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_IA64_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_IA64_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -120,5 +119,4 @@ namespace bridges
}
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx
index 986d2106e9a9..2051be13dfa6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALL_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALL_HXX
+#pragma once
#include <sal/config.h>
@@ -26,6 +25,4 @@ extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void ** pCallStack,
void * pRegisterReturn);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
index 4098b87d8984..4eafe8edc531 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
+#pragma once
#include <sal/config.h>
@@ -35,6 +34,4 @@ void callVirtualMethod(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
index 122a750fa86b..55bc7e918588 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_M68K_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -82,5 +81,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
index f22149c03be7..55bc7e918588 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -82,5 +81,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx b/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
index 0be88ee62587..dc84d56b88ae 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_CALL_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_CALL_HXX
+#pragma once
#include <sal/config.h>
@@ -33,6 +32,4 @@ namespace {
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx
index e93a7e8af505..ee2235e4fc4b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_MIPS64_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -87,5 +86,4 @@ void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
index b29b0df7a387..55bc7e918588 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_POWERPC_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_POWERPC_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -82,5 +81,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
index f71fa916ca94..8286a878a10f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_POWERPC64_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_POWERPC64_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -88,5 +87,4 @@ namespace ppc64
bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
index dccda8913f1c..63e4f2bcd629 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_S390_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_S390_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -81,5 +80,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
index 93c5ee2fb456..383c1da1ab3f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_S390X_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_S390X_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -85,5 +84,4 @@ namespace s390x
enum s390xlimits { MAX_GPR_REGS = 5, MAX_SSE_REGS = 4 };
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
index 75678cff9f41..675a909d0c4b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_SPARC_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_SPARC_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
#include <typeinfo>
@@ -90,5 +89,4 @@ inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx
index 764f1a97c4f1..2299f95d6bd3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_SPARC64_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_SPARC64_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
#include <typeinfo>
@@ -96,5 +95,4 @@ inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index 915d45b2fc54..e8f8785c4a60 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
+#pragma once
// This is an implementation of the x86-64 ABI as described in 'System V
// Application Binary Interface, AMD64 Architecture Processor Supplement'
@@ -56,6 +55,4 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
} // namespace x86_64
-#endif // INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_ABI_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
index 3e5d3166bc47..c381aa8a9668 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALL_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALL_HXX
+#pragma once
#include <sal/config.h>
@@ -29,6 +28,4 @@ extern "C" typelib_TypeClass cpp_vtable_call(
void ** gpreg, void ** fpreg, void ** ovrflw,
sal_uInt64 * pRegisterReturn /* space for register return */ );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
index 92418607f69f..ac87c1c85b01 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
+#pragma once
#include <sal/config.h>
@@ -35,6 +34,4 @@ void callVirtualMethod(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
index e009cecf9e69..f861e52f728c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_RTTI_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_RTTI_HXX
+#pragma once
#include <sal/config.h>
@@ -32,6 +31,4 @@ std::type_info * getRtti(typelib_TypeDescription const & type);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
index 90aad264c89d..e8f8785c4a60 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
+#pragma once
// This is an implementation of the x86-64 ABI as described in 'System V
// Application Binary Interface, AMD64 Architecture Processor Supplement'
@@ -56,6 +55,4 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
} // namespace x86_64
-#endif // INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_ABI_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
index 6738970d2fb7..7e7a68675648 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALL_HXX
+#pragma once
#include <sal/config.h>
@@ -32,6 +31,4 @@ extern "C" typelib_TypeClass cpp_vtable_call(
extern "C" void privateSnippetExecutor();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
index ac096ed89279..ac87c1c85b01 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX
+#pragma once
#include <sal/config.h>
@@ -35,6 +34,4 @@ void callVirtualMethod(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index dbfa5a309080..deada0c17ac3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_SHARE_HXX
+#pragma once
#include <uno/mapping.h>
@@ -154,5 +153,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx
index 783a4c174f9c..eab54c7b05d1 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_INTEL_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_INTEL_CALLVIRTUALMETHOD_HXX
+#pragma once
#include <malloc.h>
@@ -45,6 +44,4 @@ void callVirtualMethod(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
index bf79a59915ca..de13a4f9b582 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_INTEL_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_INTEL_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
@@ -80,5 +79,4 @@ void raiseException(
void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
index 60ed7a0e5b13..675a909d0c4b 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.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_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_SPARC_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_SOLARIS_SPARC_SHARE_HXX
+#pragma once
#include "uno/mapping.h"
#include <typeinfo>
@@ -90,5 +89,4 @@ inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
index fd32db740b2a..9ee63d338656 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.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_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_INTEL_MSCI_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_INTEL_MSCI_HXX
+#pragma once
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
@@ -47,5 +46,4 @@ void msci_raiseException(
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx
index 668fb523edbd..393f8fcb45c7 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_CALL_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_CALL_HXX
+#pragma once
#include <sal/config.h>
@@ -27,6 +26,4 @@
extern "C" typelib_TypeClass cpp_vtable_call(sal_Int64 nOffsetAndIndex, void** pStack);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
index 078fd23fd11f..88d3dcd68950 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.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_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX
+#pragma once
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -47,5 +46,4 @@ void mscx_raiseException(
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index d4a937f7af8e..696ddd365533 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BASE_H
-#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BASE_H
+#pragma once
#include <sal/config.h>
@@ -255,6 +254,4 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index 730d034c6bc6..ea55a139158b 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BRIDGE_H
-#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_BRIDGE_H
+#pragma once
#include <sal/config.h>
@@ -116,6 +115,4 @@ struct Bridge
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index a31e9386d5b2..4cc145b26435 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_HELPER_H
-#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_HELPER_H
+#pragma once
#include <sal/config.h>
@@ -148,6 +147,4 @@ inline jobject compute_oid( JNI_context const & jni, jobject jo )
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 98ba7c9e505a..ede5f1718316 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
-#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
+#pragma once
#include <sal/config.h>
@@ -364,6 +363,4 @@ inline void JNI_info::append_sig(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jniunoenvironmentdata.hxx b/bridges/source/jni_uno/jniunoenvironmentdata.hxx
index 091e6dbd9eab..39ffdeea6ece 100644
--- a/bridges/source/jni_uno/jniunoenvironmentdata.hxx
+++ b/bridges/source/jni_uno/jniunoenvironmentdata.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNIUNOENVIRONMENTDATA_HXX
-#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNIUNOENVIRONMENTDATA_HXX
+#pragma once
#include <sal/config.h>
@@ -52,6 +51,4 @@ struct JniUnoEnvironmentData {
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list