diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-28 18:08:42 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-28 19:55:35 +0100 |
commit | 3bf4af8d187ba21498af5b6ea7a94cdfc3b93613 (patch) | |
tree | 77b5a0669626ca5a5bf3059176371b0f4957ae3b /udkapi/com/sun/star/uno | |
parent | d016e052ddf30649ad9b729b59134ce1e90a0263 (diff) |
Revert "tdf#124176: Use "pragma once" on udkapi/*"
This reverts commit 8fd8c0894deb1e9161aa4290c0f9c860ab4b14fb.
Reason for revert: As the failed Jenkins build shows, idlc does not support "#pragma once" in UNO .idl files.
Change-Id: Ic025d11254da87876e6248db47b8a9a124f26796
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85929
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'udkapi/com/sun/star/uno')
-rw-r--r-- | udkapi/com/sun/star/uno/DeploymentException.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/Exception.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/NamingService.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/RuntimeException.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/SecurityException.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/TypeClass.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/Uik.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XAdapter.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XAggregation.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XComponentContext.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XCurrentContext.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XInterface.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XNamingService.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XReference.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XUnloadingPreference.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XWeak.idl | 4 |
16 files changed, 48 insertions, 16 deletions
diff --git a/udkapi/com/sun/star/uno/DeploymentException.idl b/udkapi/com/sun/star/uno/DeploymentException.idl index 407dc70cd3a9..e3f6ef240a4c 100644 --- a/udkapi/com/sun/star/uno/DeploymentException.idl +++ b/udkapi/com/sun/star/uno/DeploymentException.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_DeploymentException_idl__ +#define __com_sun_star_uno_DeploymentException_idl__ #include <com/sun/star/uno/RuntimeException.idl> @@ -36,5 +37,6 @@ published exception DeploymentException : com::sun::star::uno::RuntimeException }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/Exception.idl b/udkapi/com/sun/star/uno/Exception.idl index d6d3ca703471..80b151930e0f 100644 --- a/udkapi/com/sun/star/uno/Exception.idl +++ b/udkapi/com/sun/star/uno/Exception.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_Exception_idl__ +#define __com_sun_star_uno_Exception_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -48,5 +49,6 @@ published exception Exception }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl index 54476e053d2d..4ecaac920fd0 100644 --- a/udkapi/com/sun/star/uno/NamingService.idl +++ b/udkapi/com/sun/star/uno/NamingService.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_NamingService_idl__ +#define __com_sun_star_uno_NamingService_idl__ #include <com/sun/star/uno/XNamingService.idl> @@ -34,5 +35,6 @@ published service NamingService : com::sun::star::uno::XNamingService; Source Code Control System - Update =============================================================================*/ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/RuntimeException.idl b/udkapi/com/sun/star/uno/RuntimeException.idl index 1ead53c26121..284efd173fe6 100644 --- a/udkapi/com/sun/star/uno/RuntimeException.idl +++ b/udkapi/com/sun/star/uno/RuntimeException.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_RuntimeException_idl__ +#define __com_sun_star_uno_RuntimeException_idl__ #include <com/sun/star/uno/Exception.idl> @@ -40,5 +41,6 @@ published exception RuntimeException: com::sun::star::uno::Exception }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/SecurityException.idl b/udkapi/com/sun/star/uno/SecurityException.idl index 70c043e79710..1713ec777981 100644 --- a/udkapi/com/sun/star/uno/SecurityException.idl +++ b/udkapi/com/sun/star/uno/SecurityException.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_SecurityException_idl__ +#define __com_sun_star_uno_SecurityException_idl__ #include <com/sun/star/uno/RuntimeException.idl> @@ -34,5 +35,6 @@ published exception SecurityException : com::sun::star::uno::RuntimeException }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/TypeClass.idl b/udkapi/com/sun/star/uno/TypeClass.idl index b2a3597a9295..1def57d6fbb9 100644 --- a/udkapi/com/sun/star/uno/TypeClass.idl +++ b/udkapi/com/sun/star/uno/TypeClass.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_TypeClass_idl__ +#define __com_sun_star_uno_TypeClass_idl__ @@ -139,5 +140,6 @@ published enum TypeClass }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/Uik.idl b/udkapi/com/sun/star/uno/Uik.idl index 5bce9be80c22..1aa266cc8d3e 100644 --- a/udkapi/com/sun/star/uno/Uik.idl +++ b/udkapi/com/sun/star/uno/Uik.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_Uik_idl__ +#define __com_sun_star_uno_Uik_idl__ @@ -53,5 +54,6 @@ published struct Uik }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XAdapter.idl b/udkapi/com/sun/star/uno/XAdapter.idl index 5eb047df8676..506d888648c0 100644 --- a/udkapi/com/sun/star/uno/XAdapter.idl +++ b/udkapi/com/sun/star/uno/XAdapter.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XAdapter_idl__ +#define __com_sun_star_uno_XAdapter_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -61,5 +62,6 @@ published interface XAdapter: com::sun::star::uno::XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XAggregation.idl b/udkapi/com/sun/star/uno/XAggregation.idl index c894daa6135b..2bd5b6f256b1 100644 --- a/udkapi/com/sun/star/uno/XAggregation.idl +++ b/udkapi/com/sun/star/uno/XAggregation.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XAggregation_idl__ +#define __com_sun_star_uno_XAggregation_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -105,5 +106,6 @@ published interface XAggregation: com::sun::star::uno::XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XComponentContext.idl b/udkapi/com/sun/star/uno/XComponentContext.idl index 305dac99f05e..ad61a2d3fbba 100644 --- a/udkapi/com/sun/star/uno/XComponentContext.idl +++ b/udkapi/com/sun/star/uno/XComponentContext.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XComponentContext_idl__ +#define __com_sun_star_uno_XComponentContext_idl__ #include <com/sun/star/uno/Exception.idl> @@ -56,5 +57,6 @@ published interface XComponentContext : XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XCurrentContext.idl b/udkapi/com/sun/star/uno/XCurrentContext.idl index 3505a3fc9b2d..f915efd2ad49 100644 --- a/udkapi/com/sun/star/uno/XCurrentContext.idl +++ b/udkapi/com/sun/star/uno/XCurrentContext.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XCurrentContext_idl__ +#define __com_sun_star_uno_XCurrentContext_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -47,5 +48,6 @@ published interface XCurrentContext : XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XInterface.idl b/udkapi/com/sun/star/uno/XInterface.idl index cfb2b012f022..f8632a8e47c7 100644 --- a/udkapi/com/sun/star/uno/XInterface.idl +++ b/udkapi/com/sun/star/uno/XInterface.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XInterface_idl__ +#define __com_sun_star_uno_XInterface_idl__ module com { module sun { module star { module uno { @@ -110,5 +111,6 @@ published interface XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XNamingService.idl b/udkapi/com/sun/star/uno/XNamingService.idl index 3605360cdd1f..b0e592401f6f 100644 --- a/udkapi/com/sun/star/uno/XNamingService.idl +++ b/udkapi/com/sun/star/uno/XNamingService.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XNamingService_idl__ +#define __com_sun_star_uno_XNamingService_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -63,5 +64,6 @@ published interface XNamingService: com::sun::star::uno::XInterface Source Code Control System - Update =============================================================================*/ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XReference.idl b/udkapi/com/sun/star/uno/XReference.idl index 60db83f6026e..39b4cdb7090e 100644 --- a/udkapi/com/sun/star/uno/XReference.idl +++ b/udkapi/com/sun/star/uno/XReference.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XReference_idl__ +#define __com_sun_star_uno_XReference_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -46,5 +47,6 @@ published interface XReference: com::sun::star::uno::XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XUnloadingPreference.idl b/udkapi/com/sun/star/uno/XUnloadingPreference.idl index 71d63edc179f..28dbea1fcbf9 100644 --- a/udkapi/com/sun/star/uno/XUnloadingPreference.idl +++ b/udkapi/com/sun/star/uno/XUnloadingPreference.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XUnloadingPreference_idl__ +#define __com_sun_star_uno_XUnloadingPreference_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -34,5 +35,6 @@ published interface XUnloadingPreference: com::sun::star::uno::XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/uno/XWeak.idl b/udkapi/com/sun/star/uno/XWeak.idl index b5a8efd7d2a6..16e7428f5d04 100644 --- a/udkapi/com/sun/star/uno/XWeak.idl +++ b/udkapi/com/sun/star/uno/XWeak.idl @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef __com_sun_star_uno_XWeak_idl__ +#define __com_sun_star_uno_XWeak_idl__ #include <com/sun/star/uno/XInterface.idl> @@ -96,5 +97,6 @@ published interface XWeak: com::sun::star::uno::XInterface }; }; }; }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |