From 5687eba49fa06202bd190c87ad8e7af634354799 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Jun 2022 16:57:49 +0200 Subject: 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 --- udkapi/com/sun/star/task/XInteractionAbort.idl | 6 ------ udkapi/com/sun/star/task/XInteractionContinuation.idl | 6 ------ udkapi/com/sun/star/task/XInteractionHandler.idl | 8 -------- udkapi/com/sun/star/task/XInteractionHandler2.idl | 6 ------ udkapi/com/sun/star/task/XInteractionRequest.idl | 8 -------- udkapi/com/sun/star/task/XInteractionRetry.idl | 6 ------ 6 files changed, 40 deletions(-) (limited to 'udkapi/com/sun/star/task') diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl index 0124933ccacd..3130d25ec8db 100644 --- a/udkapi/com/sun/star/task/XInteractionAbort.idl +++ b/udkapi/com/sun/star/task/XInteractionAbort.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_task_XInteractionAbort_idl__ -#define __com_sun_star_task_XInteractionAbort_idl__ - -#include @@ -35,6 +31,4 @@ published interface XInteractionAbort: com::sun::star::task::XInteractionContinu }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl index d4fcf0aa19a4..58605d8082ef 100644 --- a/udkapi/com/sun/star/task/XInteractionContinuation.idl +++ b/udkapi/com/sun/star/task/XInteractionContinuation.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_task_XInteractionContinuation_idl__ -#define __com_sun_star_task_XInteractionContinuation_idl__ - -#include @@ -44,6 +40,4 @@ published interface XInteractionContinuation: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl index 26e765c5e3fa..4b8571419f0b 100644 --- a/udkapi/com/sun/star/task/XInteractionHandler.idl +++ b/udkapi/com/sun/star/task/XInteractionHandler.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_task_XInteractionHandler_idl__ -#define __com_sun_star_task_XInteractionHandler_idl__ - -#include - -#include @@ -40,6 +34,4 @@ published interface XInteractionHandler: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl index 07b5995a8467..4f620a37475f 100644 --- a/udkapi/com/sun/star/task/XInteractionHandler2.idl +++ b/udkapi/com/sun/star/task/XInteractionHandler2.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_task_XInteractionHandler2_idl__ -#define __com_sun_star_task_XInteractionHandler2_idl__ - -#include @@ -50,6 +46,4 @@ published interface XInteractionHandler2 : com::sun::star::task::XInteractionHan }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl index 3738ce1b4d7f..3c40bd6e1292 100644 --- a/udkapi/com/sun/star/task/XInteractionRequest.idl +++ b/udkapi/com/sun/star/task/XInteractionRequest.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_task_XInteractionRequest_idl__ -#define __com_sun_star_task_XInteractionRequest_idl__ - -#include - -#include @@ -50,6 +44,4 @@ published interface XInteractionRequest: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl index 3f31bb97d324..09560ff30444 100644 --- a/udkapi/com/sun/star/task/XInteractionRetry.idl +++ b/udkapi/com/sun/star/task/XInteractionRetry.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_task_XInteractionRetry_idl__ -#define __com_sun_star_task_XInteractionRetry_idl__ - -#include @@ -35,6 +31,4 @@ published interface XInteractionRetry: com::sun::star::task::XInteractionContinu }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit