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 --- scaddins/idl/com/sun/star/sheet/addin/Analysis.idl | 8 -------- scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl | 8 -------- scaddins/idl/com/sun/star/sheet/addin/PricingFunctions.idl | 7 ------- scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl | 9 --------- scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl | 8 -------- scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl | 8 -------- scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl | 8 -------- scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl | 8 -------- 8 files changed, 64 deletions(-) (limited to 'scaddins') diff --git a/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl index c6369b53500d..dbcaf8535713 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_Analysis_idl -#define com_sun_star_sheet_addin_Analysis_idl - -#include -#include - module com { module sun @@ -45,6 +39,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl index 3d168ce7fc30..4cec89753dd9 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_DateFunctions_idl -#define com_sun_star_sheet_addin_DateFunctions_idl - -#include -#include - module com { module sun @@ -45,6 +39,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/PricingFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/PricingFunctions.idl index b002ee6ef0c9..eb955ea16d9a 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/PricingFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/PricingFunctions.idl @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_PricingFunctions_idl -#define com_sun_star_sheet_addin_PricingFunctions_idl - -#include - module com { module sun @@ -44,6 +39,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl index 24142964efb8..e05c66dbf541 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl @@ -17,13 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_XAnalysis_idl -#define com_sun_star_sheet_addin_XAnalysis_idl - -#include -#include -#include - module com { module sun @@ -604,6 +597,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl index 83f1444cf857..0da24ad2fb36 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_XCompatibilityNames_idl -#define com_sun_star_sheet_addin_XCompatibilityNames_idl - -#include -#include - module com { module sun @@ -44,6 +38,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl index 45f229ab6da0..1c4e6ee4fee8 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_XDateFunctions_idl -#define com_sun_star_sheet_addin_XDateFunctions_idl - -#include -#include - module com { module sun @@ -86,6 +80,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl index 345e4d96731a..bad5a210a741 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_XMiscFunctions_idl -#define com_sun_star_sheet_addin_XMiscFunctions_idl - -#include -#include - module com { module sun @@ -48,6 +42,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl index 1b0dab5a3a76..1eac78a660ee 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef com_sun_star_sheet_addin_XPricingFunctions_idl -#define com_sun_star_sheet_addin_XPricingFunctions_idl - -#include -#include - module com { module sun @@ -77,6 +71,4 @@ module addin }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit