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 /odk/examples/DevelopersGuide | |
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 'odk/examples/DevelopersGuide')
12 files changed, 0 insertions, 85 deletions
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/some.idl b/odk/examples/DevelopersGuide/Components/CppComponent/some.idl index 18e3395a16d7..4c5c887a88b2 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/some.idl +++ b/odk/examples/DevelopersGuide/Components/CppComponent/some.idl @@ -33,9 +33,6 @@ * *************************************************************************/ -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/lang/IllegalArgumentException.idl> - module mymodule { diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingA.idl b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingA.idl index e609ad461b75..c2e7a49d5e87 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingA.idl +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingA.idl @@ -33,16 +33,9 @@ * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_SOMETHINGA_IDL -#define INCLUDED_COM_SUN_STAR_TEST_SOMETHINGA_IDL - -#include <XSomethingA.idl> - module com { module sun { module star { module test { service SomethingA: XSomethingA; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingB.idl b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingB.idl index 5f458aa889d9..62930a4a6601 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingB.idl +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/SomethingB.idl @@ -33,16 +33,9 @@ * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_SOMETHINGB_IDL -#define INCLUDED_COM_SUN_STAR_TEST_SOMETHINGB_IDL - -#include <XSomethingB.idl> - module com { module sun { module star { module test { service SomethingB : XSomethingB; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingA.idl b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingA.idl index 61b501229e34..1db7fcf742bd 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingA.idl +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingA.idl @@ -33,18 +33,11 @@ * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_XSOMETHINGA_IDL -#define INCLUDED_COM_SUN_STAR_TEST_XSOMETHINGA_IDL - -#include <com/sun/star/uno/XInterface.idl> - module com { module sun { module star { module test { interface XSomethingA { string methodOne([in]string value); }; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingB.idl b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingB.idl index 92d0bd19e711..e8071ae53187 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingB.idl +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/com/sun/star/test/XSomethingB.idl @@ -33,18 +33,11 @@ * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_XSOMETHINGB_IDL -#define INCLUDED_COM_SUN_STAR_TEST_XSOMETHINGB_IDL - -#include <com/sun/star/uno/XInterface.idl> - module com { module sun { module star { module test { interface XSomethingB { string methodTwo([in]string value); }; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.idl b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.idl index 68eab80ee9a8..5f440e3ec931 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.idl +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.idl @@ -33,11 +33,6 @@ * *************************************************************************/ -#ifndef _org_openoffice_LicenseTest_idl_ -#define _org_openoffice_LicenseTest_idl_ - -#include <com/sun/star/lang/XServiceInfo.idl> - // org module org { // openoffice @@ -48,6 +43,4 @@ module org { }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/ImageShrink.idl b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/ImageShrink.idl index 29741ffeb825..70f76bbed017 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/ImageShrink.idl +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/ImageShrink.idl @@ -33,17 +33,10 @@ * *************************************************************************/ -#ifndef _org_openoffice_test_ImageShrink_idl_ -#define _org_openoffice_test_ImageShrink_idl_ - -#include <org/openoffice/test/XImageShrinkFilter.idl> - module org { module openoffice { module test { service ImageShrink : XImageShrinkFilter; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrink.idl b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrink.idl index c6097925f5b2..507a1e6b16f6 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrink.idl +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrink.idl @@ -33,12 +33,6 @@ * *************************************************************************/ -#ifndef _org_openoffice_test_XImageShrink_idl_ -#define _org_openoffice_test_XImageShrink_idl_ - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/awt/Size.idl> - module org { module openoffice { module test { interface XImageShrink { @@ -51,6 +45,4 @@ interface XImageShrink { }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrinkFilter.idl b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrinkFilter.idl index 6388e0aa3ebb..b01776d51f43 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrinkFilter.idl +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrinkFilter.idl @@ -33,12 +33,6 @@ * *************************************************************************/ -#ifndef _org_openoffice_test_XImageShrinkFilter_idl_ -#define _org_openoffice_test_XImageShrinkFilter_idl_ - -#include <com/sun/star/document/XFilter.idl> -#include <org/openoffice/test/XImageShrink.idl> - module org { module openoffice { module test { interface XImageShrinkFilter { @@ -48,6 +42,4 @@ interface XImageShrinkFilter { }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/TestDialogHandler.idl b/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/TestDialogHandler.idl index 1c5e8ad4c199..7bfebd4adb43 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/TestDialogHandler.idl +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/TestDialogHandler.idl @@ -32,17 +32,11 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_TESTDIALOGHANDLER_IDL -#define INCLUDED_COM_SUN_STAR_TEST_TESTDIALOGHANDLER_IDL - -#include <XTestDialogHandler.idl> module com { module sun { module star { module test { service TestDialogHandler : XTestDialogHandler; }; }; }; }; -#endif - diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/XTestDialogHandler.idl b/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/XTestDialogHandler.idl index b7c680f3666d..b415103121d5 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/XTestDialogHandler.idl +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/com/sun/star/test/XTestDialogHandler.idl @@ -33,14 +33,6 @@ * *************************************************************************/ -#ifndef INCLUDED_COM_SUN_STAR_TEST_XTESTDIALOGHANDLER_IDL -#define INCLUDED_COM_SUN_STAR_TEST_XTESTDIALOGHANDLER_IDL - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/awt/XDialog.idl> -#include <com/sun/star/frame/XModel.idl> -#include <com/sun/star/frame/XFrame.idl> - module com { module sun { module star { module test { interface XTestDialogHandler { string createDialog( [in] string DialogURL, [in] ::com::sun::star::frame::XModel xModel, @@ -51,6 +43,4 @@ module com { module sun { module star { module test { }; }; }; }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Spreadsheet/XExampleAddIn.idl b/odk/examples/DevelopersGuide/Spreadsheet/XExampleAddIn.idl index 2d75f437bc00..9824d4253b0a 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/XExampleAddIn.idl +++ b/odk/examples/DevelopersGuide/Spreadsheet/XExampleAddIn.idl @@ -33,12 +33,6 @@ * *************************************************************************/ -#ifndef _ORG_OPENOFFICE_SHEET_ADDIN_XEXAMPLEADDIN_IDL_ -#define _ORG_OPENOFFICE_SHEET_ADDIN_XEXAMPLEADDIN_IDL_ - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/sheet/XVolatileResult.idl> - module org { module openoffice { module sheet { @@ -57,6 +51,4 @@ module org { }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |