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 /offapi/com/sun/star/scanner | |
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 'offapi/com/sun/star/scanner')
-rw-r--r-- | offapi/com/sun/star/scanner/ScanError.idl | 4 | ||||
-rw-r--r-- | offapi/com/sun/star/scanner/ScannerContext.idl | 4 | ||||
-rw-r--r-- | offapi/com/sun/star/scanner/ScannerException.idl | 7 | ||||
-rw-r--r-- | offapi/com/sun/star/scanner/ScannerManager.idl | 7 | ||||
-rw-r--r-- | offapi/com/sun/star/scanner/XScannerManager.idl | 11 | ||||
-rw-r--r-- | offapi/com/sun/star/scanner/XScannerManager2.idl | 7 |
6 files changed, 0 insertions, 40 deletions
diff --git a/offapi/com/sun/star/scanner/ScanError.idl b/offapi/com/sun/star/scanner/ScanError.idl index 614cffe9a320..b1157035760e 100644 --- a/offapi/com/sun/star/scanner/ScanError.idl +++ b/offapi/com/sun/star/scanner/ScanError.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_scanner_ScanError_idl__ -#define __com_sun_star_scanner_ScanError_idl__ @@ -63,6 +61,4 @@ published enum ScanError }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scanner/ScannerContext.idl b/offapi/com/sun/star/scanner/ScannerContext.idl index 1104e8c0bb54..644a68d8b864 100644 --- a/offapi/com/sun/star/scanner/ScannerContext.idl +++ b/offapi/com/sun/star/scanner/ScannerContext.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_scanner_ScannerContext_idl__ -#define __com_sun_star_scanner_ScannerContext_idl__ @@ -42,6 +40,4 @@ published struct ScannerContext }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scanner/ScannerException.idl b/offapi/com/sun/star/scanner/ScannerException.idl index 8f1a8d83629f..c716d3412fce 100644 --- a/offapi/com/sun/star/scanner/ScannerException.idl +++ b/offapi/com/sun/star/scanner/ScannerException.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_scanner_ScannerException_idl__ -#define __com_sun_star_scanner_ScannerException_idl__ - -#include <com/sun/star/uno/Exception.idl> -#include <com/sun/star/scanner/ScanError.idl> @@ -41,6 +36,4 @@ published exception ScannerException: com::sun::star::uno::Exception }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl index c774ea674f2f..d37f1bcc76d9 100644 --- a/offapi/com/sun/star/scanner/ScannerManager.idl +++ b/offapi/com/sun/star/scanner/ScannerManager.idl @@ -18,11 +18,6 @@ */ -#ifndef __com_sun_star_scanner_ScannerManager_idl__ -#define __com_sun_star_scanner_ScannerManager_idl__ - -#include <com/sun/star/scanner/XScannerManager2.idl> - module com { module sun { module star { module scanner { @@ -35,6 +30,4 @@ published service ScannerManager : XScannerManager2; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl index c261b345a64c..082a76ad7faa 100644 --- a/offapi/com/sun/star/scanner/XScannerManager.idl +++ b/offapi/com/sun/star/scanner/XScannerManager.idl @@ -16,15 +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_scanner_XScannerManager_idl__ -#define __com_sun_star_scanner_XScannerManager_idl__ - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/scanner/ScannerContext.idl> -#include <com/sun/star/scanner/ScannerException.idl> -#include <com/sun/star/lang/XEventListener.idl> -#include <com/sun/star/scanner/ScanError.idl> -#include <com/sun/star/awt/XBitmap.idl> @@ -69,6 +60,4 @@ published interface XScannerManager: com::sun::star::uno::XInterface }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/scanner/XScannerManager2.idl b/offapi/com/sun/star/scanner/XScannerManager2.idl index 8272b461a1d4..42f565c1b488 100644 --- a/offapi/com/sun/star/scanner/XScannerManager2.idl +++ b/offapi/com/sun/star/scanner/XScannerManager2.idl @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __com_sun_star_scanner_XScannerManager2_idl__ -#define __com_sun_star_scanner_XScannerManager2_idl__ - -#include <com/sun/star/scanner/XScannerManager.idl> - module com { module sun { module star { module scanner { @@ -36,6 +31,4 @@ published interface XScannerManager2: com::sun::star::scanner::XScannerManager }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |