summaryrefslogtreecommitdiff
path: root/testtools
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 /testtools
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 'testtools')
-rw-r--r--testtools/source/bridgetest/idl/bridgetest.idl5
-rw-r--r--testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl6
-rw-r--r--testtools/source/servicetests/TestService1.idl7
-rw-r--r--testtools/source/servicetests/TestService2.idl10
-rw-r--r--testtools/source/servicetests/XTestService1.idl7
-rw-r--r--testtools/source/servicetests/XTestService2.idl7
-rw-r--r--testtools/source/servicetests/XTestService3.idl7
-rw-r--r--testtools/source/servicetests/XTestService4.idl7
8 files changed, 0 insertions, 56 deletions
diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl
index 82d63c37e9e3..4857522aa9a5 100644
--- a/testtools/source/bridgetest/idl/bridgetest.idl
+++ b/testtools/source/bridgetest/idl/bridgetest.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/uno/XComponentContext.idl>
-#include <com/sun/star/uno/XInterface.idl>
-
module test { module testtools { module bridgetest {
enum TestEnum
diff --git a/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl b/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
index b92b7b4c3dbc..bbc896a8bb2a 100644
--- a/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
+++ b/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
@@ -16,10 +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_test_performance_XPerformanceTest_idl__
-#define __com_sun_star_test_performance_XPerformanceTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
module com
{
@@ -125,6 +121,4 @@ published interface XPerformanceTest : com::sun::star::uno::XInterface
};
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/TestService1.idl b/testtools/source/servicetests/TestService1.idl
index 386b62e58973..54d62c9be254 100644
--- a/testtools/source/servicetests/TestService1.idl
+++ b/testtools/source/servicetests/TestService1.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_TestService1_idl__
-#define __testtools_servicetests_TestService1_idl__
-
-#include <XTestService1.idl>
-
module servicetests {
interface TestService1 {
@@ -44,6 +39,4 @@ interface TestService1 {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/TestService2.idl b/testtools/source/servicetests/TestService2.idl
index dc06f5c452ca..7d1bd4d53900 100644
--- a/testtools/source/servicetests/TestService2.idl
+++ b/testtools/source/servicetests/TestService2.idl
@@ -17,14 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_TestService2_idl__
-#define __testtools_servicetests_TestService2_idl__
-
-#include <TestService1.idl>
-#include <XTestService2.idl>
-#include <XTestService3.idl>
-#include <XTestService4.idl>
-
module servicetests {
interface TestService2 {
@@ -36,6 +28,4 @@ interface TestService2 {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/XTestService1.idl b/testtools/source/servicetests/XTestService1.idl
index 9e0d802950bd..1c463dde4e1e 100644
--- a/testtools/source/servicetests/XTestService1.idl
+++ b/testtools/source/servicetests/XTestService1.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_XTestService1_idl__
-#define __testtools_servicetests_XTestService1_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
module servicetests {
interface XTestService1: com::sun::star::uno::XInterface {
@@ -30,6 +25,4 @@ interface XTestService1: com::sun::star::uno::XInterface {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/XTestService2.idl b/testtools/source/servicetests/XTestService2.idl
index 98f48b49bad4..032d9a2cf9fd 100644
--- a/testtools/source/servicetests/XTestService2.idl
+++ b/testtools/source/servicetests/XTestService2.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_XTestService2_idl__
-#define __testtools_servicetests_XTestService2_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
module servicetests {
interface XTestService2: com::sun::star::uno::XInterface {
@@ -30,6 +25,4 @@ interface XTestService2: com::sun::star::uno::XInterface {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/XTestService3.idl b/testtools/source/servicetests/XTestService3.idl
index 493426542604..8b0bc46f0fe5 100644
--- a/testtools/source/servicetests/XTestService3.idl
+++ b/testtools/source/servicetests/XTestService3.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_XTestService3_idl__
-#define __testtools_servicetests_XTestService3_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
module servicetests {
interface XTestService3: com::sun::star::uno::XInterface {
@@ -30,6 +25,4 @@ interface XTestService3: com::sun::star::uno::XInterface {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/testtools/source/servicetests/XTestService4.idl b/testtools/source/servicetests/XTestService4.idl
index f2d7e5b9b388..5bafc2bfa1a8 100644
--- a/testtools/source/servicetests/XTestService4.idl
+++ b/testtools/source/servicetests/XTestService4.idl
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __testtools_servicetests_XTestService4_idl__
-#define __testtools_servicetests_XTestService4_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
module servicetests {
interface XTestService4: com::sun::star::uno::XInterface {
@@ -30,6 +25,4 @@ interface XTestService4: com::sun::star::uno::XInterface {
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */