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/loader | |
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/loader')
-rw-r--r-- | udkapi/com/sun/star/loader/CannotActivateFactoryException.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/loader/Dynamic.idl | 6 | ||||
-rw-r--r-- | udkapi/com/sun/star/loader/Java.idl | 5 | ||||
-rw-r--r-- | udkapi/com/sun/star/loader/Java2.idl | 5 | ||||
-rw-r--r-- | udkapi/com/sun/star/loader/SharedLibrary.idl | 5 | ||||
-rw-r--r-- | udkapi/com/sun/star/loader/XImplementationLoader.idl | 12 |
6 files changed, 0 insertions, 39 deletions
diff --git a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl index 9b36aee809fa..29a72b6658cd 100644 --- a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl +++ b/udkapi/com/sun/star/loader/CannotActivateFactoryException.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_loader_CannotActivateFactoryException_idl__ -#define __com_sun_star_loader_CannotActivateFactoryException_idl__ - -#include <com/sun/star/uno/Exception.idl> module com { module sun { module star { module loader { @@ -43,6 +39,4 @@ published exception CannotActivateFactoryException: com::sun::star::uno::Excepti }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl index 7759e775a6e6..4f9303dd6a86 100644 --- a/udkapi/com/sun/star/loader/Dynamic.idl +++ b/udkapi/com/sun/star/loader/Dynamic.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_loader_Dynamic_idl__ -#define __com_sun_star_loader_Dynamic_idl__ - -#include <com/sun/star/lang/XServiceInfo.idl> module com { module sun { module star { module loader { @@ -46,6 +42,4 @@ published service Dynamic : XImplementationLoader; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/loader/Java.idl b/udkapi/com/sun/star/loader/Java.idl index bf8731d3e3b0..5ad7e2db2b1c 100644 --- a/udkapi/com/sun/star/loader/Java.idl +++ b/udkapi/com/sun/star/loader/Java.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_loader_Java_idl__ -#define __com_sun_star_loader_Java_idl__ - -#include <com/sun/star/lang/XServiceInfo.idl> module com { module sun { module star { module loader { @@ -43,6 +39,5 @@ published service Java : XImplementationLoader; Source Code Control System - Update =====================================================================*/ -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/loader/Java2.idl b/udkapi/com/sun/star/loader/Java2.idl index f2143fe4ea28..b65a20e47b78 100644 --- a/udkapi/com/sun/star/loader/Java2.idl +++ b/udkapi/com/sun/star/loader/Java2.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_loader_Java2_idl__ -#define __com_sun_star_loader_Java2_idl__ - -#include <com/sun/star/loader/XImplementationLoader.idl> module com { module sun { module star { module loader { /**the same as com::sun::star::loader::Java. @@ -37,6 +33,5 @@ published service Java2 }; }; }; }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/loader/SharedLibrary.idl b/udkapi/com/sun/star/loader/SharedLibrary.idl index 6f6f7790d5a5..0c5d2cb49876 100644 --- a/udkapi/com/sun/star/loader/SharedLibrary.idl +++ b/udkapi/com/sun/star/loader/SharedLibrary.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_loader_SharedLibrary_idl__ -#define __com_sun_star_loader_SharedLibrary_idl__ - -#include <com/sun/star/lang/XServiceInfo.idl> module com { module sun { module star { module loader { @@ -42,6 +38,5 @@ published service SharedLibrary : XImplementationLoader; Source Code Control System - Update =====================================================================*/ -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/loader/XImplementationLoader.idl b/udkapi/com/sun/star/loader/XImplementationLoader.idl index d5a5ee3053c0..58ed3ea9c886 100644 --- a/udkapi/com/sun/star/loader/XImplementationLoader.idl +++ b/udkapi/com/sun/star/loader/XImplementationLoader.idl @@ -16,16 +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_loader_XImplementationLoader_idl__ -#define __com_sun_star_loader_XImplementationLoader_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -#include <com/sun/star/registry/XRegistryKey.idl> - -#include <com/sun/star/registry/CannotRegisterImplementationException.idl> - -#include <com/sun/star/loader/CannotActivateFactoryException.idl> module com { module sun { module star { module loader { @@ -99,6 +89,4 @@ published interface XImplementationLoader: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |