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 /cppuhelper | |
| 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 'cppuhelper')
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/types.idl | 13 | ||||
| -rw-r--r-- | cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/cppuhelper/qa/propertysetmixin/types.idl b/cppuhelper/qa/propertysetmixin/types.idl index ee1958032b2e..0b4a032470db 100644 --- a/cppuhelper/qa/propertysetmixin/types.idl +++ b/cppuhelper/qa/propertysetmixin/types.idl @@ -17,17 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __testtools_servicetests_TestService1_idl__ -#define __testtools_servicetests_TestService1_idl__ - -#include <com/sun/star/beans/Ambiguous.idl> -#include <com/sun/star/beans/Defaulted.idl> -#include <com/sun/star/beans/Optional.idl> -#include <com/sun/star/beans/PropertyVetoException.idl> -#include <com/sun/star/beans/UnknownPropertyException.idl> -#include <com/sun/star/lang/XComponent.idl> -#include <com/sun/star/uno/XInterface.idl> - module test { module cppuhelper { module propertysetmixin { interface XTest1 { @@ -74,6 +63,4 @@ service JavaSupplier: XSupplier; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl index 23baea7e5bcb..f13cf16e0f31 100644 --- a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl +++ b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_cppuhelper_detail_XExceptionThrower_idl -#define INCLUDED_cppuhelper_detail_XExceptionThrower_idl - -#include <com/sun/star/uno/Exception.idl> -#include <com/sun/star/uno/XInterface.idl> - module cppuhelper { module detail { @@ -36,6 +30,4 @@ interface XExceptionThrower : com::sun::star::uno::XInterface }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |