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/util | |
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/util')
-rw-r--r-- | udkapi/com/sun/star/util/BootstrapMacroExpander.idl | 7 | ||||
-rw-r--r-- | udkapi/com/sun/star/util/MacroExpander.idl | 7 | ||||
-rw-r--r-- | udkapi/com/sun/star/util/XMacroExpander.idl | 7 | ||||
-rw-r--r-- | udkapi/com/sun/star/util/XVeto.idl | 7 | ||||
-rw-r--r-- | udkapi/com/sun/star/util/theMacroExpander.idl | 7 |
5 files changed, 0 insertions, 35 deletions
diff --git a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl index 55fffdcefbd9..975c9428591d 100644 --- a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl +++ b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl @@ -16,11 +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_util_BootstrapMacroExpander_idl__ -#define __com_sun_star_util_BootstrapMacroExpander_idl__ - -#include <com/sun/star/util/MacroExpander.idl> -#include <com/sun/star/lang/XInitialization.idl> @@ -48,6 +43,4 @@ published service BootstrapMacroExpander }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/util/MacroExpander.idl b/udkapi/com/sun/star/util/MacroExpander.idl index 5c49d926541f..9aaed94f9f5f 100644 --- a/udkapi/com/sun/star/util/MacroExpander.idl +++ b/udkapi/com/sun/star/util/MacroExpander.idl @@ -16,11 +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_util_MacroExpander_idl__ -#define __com_sun_star_util_MacroExpander_idl__ - -#include <com/sun/star/lang/XComponent.idl> -#include <com/sun/star/util/XMacroExpander.idl> module com { module sun { module star { module util { @@ -45,6 +40,4 @@ published service MacroExpander }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/util/XMacroExpander.idl b/udkapi/com/sun/star/util/XMacroExpander.idl index 3fdc598981f5..33cdce1cdbe4 100644 --- a/udkapi/com/sun/star/util/XMacroExpander.idl +++ b/udkapi/com/sun/star/util/XMacroExpander.idl @@ -16,11 +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_util_XMacroExpander_idl__ -#define __com_sun_star_util_XMacroExpander_idl__ - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/lang/IllegalArgumentException.idl> @@ -49,6 +44,4 @@ published interface XMacroExpander : com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/util/XVeto.idl b/udkapi/com/sun/star/util/XVeto.idl index ece6a69903d6..12ee777599c7 100644 --- a/udkapi/com/sun/star/util/XVeto.idl +++ b/udkapi/com/sun/star/util/XVeto.idl @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_util_XVeto_idl__ -#define __com_sun_star_util_XVeto_idl__ - -#include <com/sun/star/uno/XInterface.idl> - module com { module sun { module star { module util { @@ -46,6 +41,4 @@ interface XVeto }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/util/theMacroExpander.idl b/udkapi/com/sun/star/util/theMacroExpander.idl index c2de31268ad3..077b95d5683e 100644 --- a/udkapi/com/sun/star/util/theMacroExpander.idl +++ b/udkapi/com/sun/star/util/theMacroExpander.idl @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_util_theMacroExpander_idl__ -#define __com_sun_star_util_theMacroExpander_idl__ - -#include <com/sun/star/util/XMacroExpander.idl> - module com { module sun { module star { module util { /** A service that has to deal with macrofied strings will preprocess those @@ -39,6 +34,4 @@ published singleton theMacroExpander : XMacroExpander; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |