diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-06-10 16:57:49 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-06-13 16:27:45 +0200 |
commit | 5687eba49fa06202bd190c87ad8e7af634354799 (patch) | |
tree | 2cd5cdce96c30c78011922ca2ceccb9b833c3a08 /udkapi/com/sun/star/uno | |
parent | 32dd76143bdf55ac73f03f705097453521b4bf2c (diff) |
Drop obsolete preprocessor directives from UNOIDL files
...which were used by ildc, which is gone since
a8485d558fab53291e2530fd9a1be581c1628deb "[API CHANGE] Remove deprecated idlc
and regmerge from the SDK", and have always been ignored as legacy by its
unoidl-write replacement.
This change has been carried out (making use of GNU sed extensions) with
> for i in $(git ls-files \*.idl); do sed -i -z -E -e 's/\n\n((#[^\n]*\n)+\n)*(#[^\n]*\n)+\n?/\n\n/g' -e 's/\n(#[^\n]*\n)+/\n/g' "$i"; done && git checkout extensions/source/activex/so_activex.idl odk/examples/OLE/activex/so_activex.idl
which apparently happened to do the work. (The final two files are not UNOIDL
source files.)
Change-Id: Ic9369e05d46e8f7e8a304ab01740b171b92335cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135683
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'udkapi/com/sun/star/uno')
-rw-r--r-- | udkapi/com/sun/star/uno/DeploymentException.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/Exception.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/NamingService.idl | 5 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/RuntimeException.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/SecurityException.idl | 6 | ||||
-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 | 8 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XAggregation.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XComponentContext.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XCurrentContext.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XInterface.idl | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XNamingService.idl | 7 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XReference.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XUnloadingPreference.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/uno/XWeak.idl | 8 |
16 files changed, 0 insertions, 94 deletions
diff --git a/udkapi/com/sun/star/uno/DeploymentException.idl b/udkapi/com/sun/star/uno/DeploymentException.idl index e3f6ef240a4c..a92c5ba35a6a 100644 --- a/udkapi/com/sun/star/uno/DeploymentException.idl +++ b/udkapi/com/sun/star/uno/DeploymentException.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_DeploymentException_idl__ -#define __com_sun_star_uno_DeploymentException_idl__ - -#include <com/sun/star/uno/RuntimeException.idl> @@ -37,6 +33,4 @@ 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 80b151930e0f..29a0f83b6a9e 100644 --- a/udkapi/com/sun/star/uno/Exception.idl +++ b/udkapi/com/sun/star/uno/Exception.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_Exception_idl__ -#define __com_sun_star_uno_Exception_idl__ - -#include <com/sun/star/uno/XInterface.idl> @@ -49,6 +45,4 @@ 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 4ecaac920fd0..2e6017896807 100644 --- a/udkapi/com/sun/star/uno/NamingService.idl +++ b/udkapi/com/sun/star/uno/NamingService.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_NamingService_idl__ -#define __com_sun_star_uno_NamingService_idl__ - -#include <com/sun/star/uno/XNamingService.idl> module com { module sun { module star { module uno { @@ -35,6 +31,5 @@ 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 284efd173fe6..d9b6a979f891 100644 --- a/udkapi/com/sun/star/uno/RuntimeException.idl +++ b/udkapi/com/sun/star/uno/RuntimeException.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_RuntimeException_idl__ -#define __com_sun_star_uno_RuntimeException_idl__ - -#include <com/sun/star/uno/Exception.idl> @@ -41,6 +37,4 @@ 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 1713ec777981..d9e5067f92f1 100644 --- a/udkapi/com/sun/star/uno/SecurityException.idl +++ b/udkapi/com/sun/star/uno/SecurityException.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_SecurityException_idl__ -#define __com_sun_star_uno_SecurityException_idl__ - -#include <com/sun/star/uno/RuntimeException.idl> @@ -35,6 +31,4 @@ 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 1def57d6fbb9..ebb9e629083c 100644 --- a/udkapi/com/sun/star/uno/TypeClass.idl +++ b/udkapi/com/sun/star/uno/TypeClass.idl @@ -16,8 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_TypeClass_idl__ -#define __com_sun_star_uno_TypeClass_idl__ @@ -140,6 +138,4 @@ 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 1aa266cc8d3e..faf20af05201 100644 --- a/udkapi/com/sun/star/uno/Uik.idl +++ b/udkapi/com/sun/star/uno/Uik.idl @@ -16,8 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_Uik_idl__ -#define __com_sun_star_uno_Uik_idl__ @@ -54,6 +52,4 @@ 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 506d888648c0..6dfdac7f3c1c 100644 --- a/udkapi/com/sun/star/uno/XAdapter.idl +++ b/udkapi/com/sun/star/uno/XAdapter.idl @@ -16,12 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XAdapter_idl__ -#define __com_sun_star_uno_XAdapter_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -#include <com/sun/star/uno/XReference.idl> @@ -62,6 +56,4 @@ 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 2bd5b6f256b1..cf81178eb06a 100644 --- a/udkapi/com/sun/star/uno/XAggregation.idl +++ b/udkapi/com/sun/star/uno/XAggregation.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XAggregation_idl__ -#define __com_sun_star_uno_XAggregation_idl__ - -#include <com/sun/star/uno/XInterface.idl> module com { module sun { module star { module uno { @@ -106,6 +102,4 @@ 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 ad61a2d3fbba..12b4b485e05e 100644 --- a/udkapi/com/sun/star/uno/XComponentContext.idl +++ b/udkapi/com/sun/star/uno/XComponentContext.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XComponentContext_idl__ -#define __com_sun_star_uno_XComponentContext_idl__ - -#include <com/sun/star/uno/Exception.idl> module com { module sun { module star { module lang { @@ -57,6 +53,4 @@ 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 f915efd2ad49..487e2da9bfa5 100644 --- a/udkapi/com/sun/star/uno/XCurrentContext.idl +++ b/udkapi/com/sun/star/uno/XCurrentContext.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XCurrentContext_idl__ -#define __com_sun_star_uno_XCurrentContext_idl__ - -#include <com/sun/star/uno/XInterface.idl> module com { module sun { module star { module uno { @@ -48,6 +44,4 @@ 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 f8632a8e47c7..b34df5f346ae 100644 --- a/udkapi/com/sun/star/uno/XInterface.idl +++ b/udkapi/com/sun/star/uno/XInterface.idl @@ -16,8 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XInterface_idl__ -#define __com_sun_star_uno_XInterface_idl__ module com { module sun { module star { module uno { @@ -111,6 +109,4 @@ 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 b0e592401f6f..d412cfafac15 100644 --- a/udkapi/com/sun/star/uno/XNamingService.idl +++ b/udkapi/com/sun/star/uno/XNamingService.idl @@ -16,12 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XNamingService_idl__ -#define __com_sun_star_uno_XNamingService_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -#include <com/sun/star/uno/Exception.idl> module com { module sun { module star { module uno { @@ -64,6 +58,5 @@ 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 39b4cdb7090e..a97027410bf6 100644 --- a/udkapi/com/sun/star/uno/XReference.idl +++ b/udkapi/com/sun/star/uno/XReference.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XReference_idl__ -#define __com_sun_star_uno_XReference_idl__ - -#include <com/sun/star/uno/XInterface.idl> @@ -47,6 +43,4 @@ 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 28dbea1fcbf9..39e118e7b700 100644 --- a/udkapi/com/sun/star/uno/XUnloadingPreference.idl +++ b/udkapi/com/sun/star/uno/XUnloadingPreference.idl @@ -16,10 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XUnloadingPreference_idl__ -#define __com_sun_star_uno_XUnloadingPreference_idl__ - -#include <com/sun/star/uno/XInterface.idl> module com { module sun { module star { module uno { @@ -35,6 +31,4 @@ 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 16e7428f5d04..35c7fd3d210f 100644 --- a/udkapi/com/sun/star/uno/XWeak.idl +++ b/udkapi/com/sun/star/uno/XWeak.idl @@ -16,12 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_uno_XWeak_idl__ -#define __com_sun_star_uno_XWeak_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -#include <com/sun/star/uno/XAdapter.idl> @@ -97,6 +91,4 @@ published interface XWeak: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |