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 /cppu | |
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 'cppu')
-rw-r--r-- | cppu/qa/cppumaker/types.idl | 8 | ||||
-rw-r--r-- | cppu/qa/types.idl | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/cppu/qa/cppumaker/types.idl b/cppu/qa/cppumaker/types.idl index 98ed1f867f21..b4dbe2e1de13 100644 --- a/cppu/qa/cppumaker/types.idl +++ b/cppu/qa/cppumaker/types.idl @@ -19,14 +19,6 @@ /*TODO: Do not depend on types for which C++ header files are only generated later in the build process in offuh: */ -#include <com/sun/star/lang/ClassNotFoundException.idl> -#include <com/sun/star/lang/IllegalAccessException.idl> -#include <com/sun/star/lang/Locale.idl> -#include <com/sun/star/uno/DeploymentException.idl> -#include <com/sun/star/uno/Exception.idl> -#include <com/sun/star/uno/RuntimeException.idl> -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/uno/XNamingService.idl> singleton FILE: com::sun::star::uno::XInterface; singleton lconv: com::sun::star::uno::XInterface; diff --git a/cppu/qa/types.idl b/cppu/qa/types.idl index a17b035e02b1..a6febc52c8ff 100644 --- a/cppu/qa/types.idl +++ b/cppu/qa/types.idl @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/uno/Exception.idl> -#include <com/sun/star/uno/XInterface.idl> - enum Enum1 { M0, M1, M2 }; enum Enum2 { M0, M1, M2 }; |