summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-06-10 16:57:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-06-13 16:27:45 +0200
commit5687eba49fa06202bd190c87ad8e7af634354799 (patch)
tree2cd5cdce96c30c78011922ca2ceccb9b833c3a08 /stoc
parent32dd76143bdf55ac73f03f705097453521b4bf2c (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 'stoc')
-rw-r--r--stoc/test/language_binding.idl8
-rw-r--r--stoc/test/registry_tdprovider/types.idl5
-rw-r--r--stoc/test/tdmanager/types.idl2
-rw-r--r--stoc/test/tdmanager/types4_incomp.idl2
-rw-r--r--stoc/test/tdmanager/types5.idl2
-rw-r--r--stoc/test/tdmanager/types5_incomp.idl2
-rw-r--r--stoc/test/tdmanager/types6_incomp.idl2
-rw-r--r--stoc/test/testcorefl.idl1
-rw-r--r--stoc/test/testintrosp.idl10
9 files changed, 0 insertions, 34 deletions
diff --git a/stoc/test/language_binding.idl b/stoc/test/language_binding.idl
index e4d240b4fb9c..db568f077dab 100644
--- a/stoc/test/language_binding.idl
+++ b/stoc/test/language_binding.idl
@@ -17,12 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TEST_LANGUAGE_BINDING_IDL_
-#define _TEST_LANGUAGE_BINDING_IDL_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-
module test
{
@@ -158,6 +152,4 @@ interface XLanguageBindingTest : test::XLBTestBase
}; // test
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/registry_tdprovider/types.idl b/stoc/test/registry_tdprovider/types.idl
index 2398c60edcc8..7d37e2322124 100644
--- a/stoc/test/registry_tdprovider/types.idl
+++ b/stoc/test/registry_tdprovider/types.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/uno/RuntimeException.idl>
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module registrytdprovider {
published enum Enum1 { E1 };
diff --git a/stoc/test/tdmanager/types.idl b/stoc/test/tdmanager/types.idl
index ecc0e9dde896..612ad1bac4f5 100644
--- a/stoc/test/tdmanager/types.idl
+++ b/stoc/test/tdmanager/types.idl
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module tdmanager {
struct Struct<T, U> { U s; };
diff --git a/stoc/test/tdmanager/types4_incomp.idl b/stoc/test/tdmanager/types4_incomp.idl
index 6a5b112a6376..6711673ba917 100644
--- a/stoc/test/tdmanager/types4_incomp.idl
+++ b/stoc/test/tdmanager/types4_incomp.idl
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module tdmanager {
published interface XAnother {
diff --git a/stoc/test/tdmanager/types5.idl b/stoc/test/tdmanager/types5.idl
index 0ab924692d07..21eda7d3898c 100644
--- a/stoc/test/tdmanager/types5.idl
+++ b/stoc/test/tdmanager/types5.idl
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module tdmanager {
published interface XAnother {
diff --git a/stoc/test/tdmanager/types5_incomp.idl b/stoc/test/tdmanager/types5_incomp.idl
index 1b23db753900..8f3b5f83c1c1 100644
--- a/stoc/test/tdmanager/types5_incomp.idl
+++ b/stoc/test/tdmanager/types5_incomp.idl
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module tdmanager {
published interface XAnother {
diff --git a/stoc/test/tdmanager/types6_incomp.idl b/stoc/test/tdmanager/types6_incomp.idl
index eec313d7b7d6..898c9b3d2bcf 100644
--- a/stoc/test/tdmanager/types6_incomp.idl
+++ b/stoc/test/tdmanager/types6_incomp.idl
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module tdmanager {
published interface XAnother {
diff --git a/stoc/test/testcorefl.idl b/stoc/test/testcorefl.idl
index 540903cb2915..c345b725bbca 100644
--- a/stoc/test/testcorefl.idl
+++ b/stoc/test/testcorefl.idl
@@ -16,7 +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 .
*/
-#include <com/sun/star/uno/XInterface.idl>
module ModuleA
{
diff --git a/stoc/test/testintrosp.idl b/stoc/test/testintrosp.idl
index d50352fe5427..fbb53ffb7e46 100644
--- a/stoc/test/testintrosp.idl
+++ b/stoc/test/testintrosp.idl
@@ -16,14 +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_beans_XIntroTest_idl__
-#define __com_sun_star_beans_XIntroTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/Property.idl>
-#include <com/sun/star/beans/PropertyValue.idl>
-#include <com/sun/star/uno/TypeClass.idl>
-#include <com/sun/star/beans/XPropertiesChangeListener.idl>
module ModuleA
{
@@ -192,6 +184,4 @@ interface XIntroTest: com::sun::star::uno::XInterface
};
//}; }; }; };
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */