From 753e9b3d45f5970ee77505ecf8a816e4e4c5389d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 30 Jul 2012 20:42:13 +0200 Subject: udkapi, offapi: do not use #include "foo": Evidently on Windows, the newfangled ucpp handles #include "foo" differently from #include and treats it as a relative path, while the angle brackets always result in absolute paths. Since relative paths result in infinite rebuilds if make is invoked in a different directory, don't use #include "foo" in IDL files. Change-Id: Iedcda3a4be5542389a0be086f14541cda8dc5323 --- udkapi/com/sun/star/io/XAsyncOutputMonitor.idl | 4 ++-- udkapi/com/sun/star/java/WrongJavaVersionException.idl | 2 +- .../com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl | 2 +- udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl | 2 +- udkapi/com/sun/star/reflection/XParameter.idl | 2 +- udkapi/com/sun/star/reflection/XPublished.idl | 2 +- udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl | 2 +- udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl | 2 +- udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl | 2 +- udkapi/com/sun/star/reflection/XStructTypeDescription.idl | 2 +- udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl | 4 ++-- udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl | 4 ++-- udkapi/com/sun/star/util/theMacroExpander.idl | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) (limited to 'udkapi') diff --git a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl index 79366b1cc5f8..bfce69556209 100644 --- a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl +++ b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl @@ -20,8 +20,8 @@ #ifndef __com_sun_star_io_XAsyncOutputMonitor_idl__ #define __com_sun_star_io_XAsyncOutputMonitor_idl__ -#include "com/sun/star/io/IOException.idl" -#include "com/sun/star/uno/XInterface.idl" +#include +#include module com { module sun { module star { module io { diff --git a/udkapi/com/sun/star/java/WrongJavaVersionException.idl b/udkapi/com/sun/star/java/WrongJavaVersionException.idl index 6e44ceabaa09..4041cbcb80c9 100644 --- a/udkapi/com/sun/star/java/WrongJavaVersionException.idl +++ b/udkapi/com/sun/star/java/WrongJavaVersionException.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_java_WrongJavaVersionException_idl__ #define __com_sun_star_java_WrongJavaVersionException_idl__ -#include "com/sun/star/uno/Exception.idl" +#include module com { module sun { module star { module java { diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl index ef6b868abfcc..43be3a434ff9 100644 --- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl +++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XInterfaceAttributeTypeDescription2_idl__ #define __com_sun_star_reflection_XInterfaceAttributeTypeDescription2_idl__ -#include "com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl index 2bf2904b132f..7f8865575dfc 100644 --- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl +++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XInterfaceTypeDescription2_idl__ #define __com_sun_star_reflection_XInterfaceTypeDescription2_idl__ -#include "com/sun/star/reflection/XInterfaceTypeDescription.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XParameter.idl b/udkapi/com/sun/star/reflection/XParameter.idl index cdbe810a0388..4f25fbfeeba5 100644 --- a/udkapi/com/sun/star/reflection/XParameter.idl +++ b/udkapi/com/sun/star/reflection/XParameter.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XParameter_idl__ #define __com_sun_star_reflection_XParameter_idl__ -#include "com/sun/star/reflection/XMethodParameter.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XPublished.idl b/udkapi/com/sun/star/reflection/XPublished.idl index f6230e770ee5..1c6ac767d6f0 100644 --- a/udkapi/com/sun/star/reflection/XPublished.idl +++ b/udkapi/com/sun/star/reflection/XPublished.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XPublished_idl__ #define __com_sun_star_reflection_XPublished_idl__ -#include "com/sun/star/uno/XInterface.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl index b3718fd6696d..0121f1d83c36 100644 --- a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl +++ b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XServiceConstructorDescription2_idl__ #define __com_sun_star_reflection_XServiceConstructorDescription2_idl__ -#include "com/sun/star/uno/XInterface.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl index ec6d84e970c6..c792fbda0c66 100644 --- a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl +++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XServiceTypeDescription2_idl__ #define __com_sun_star_reflection_XServiceTypeDescription2_idl__ -#include "com/sun/star/reflection/XServiceTypeDescription.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl index 04a337a232bc..db7895ae6880 100644 --- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl +++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XSingletonTypeDescription2_idl__ #define __com_sun_star_reflection_XSingletonTypeDescription2_idl__ -#include "com/sun/star/reflection/XSingletonTypeDescription.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl index abc5cbd7b95a..d0cd5dc2ff99 100644 --- a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl +++ b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_reflection_XStructTypeDescription_idl__ #define __com_sun_star_reflection_XStructTypeDescription_idl__ -#include "com/sun/star/reflection/XCompoundTypeDescription.idl" +#include module com { module sun { module star { module reflection { diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl index 5fc2dffff00d..a8ac8280dc58 100644 --- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl +++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl @@ -20,8 +20,8 @@ #ifndef __com_sun_star_uri_XVndSunStarExpandUrl_idl__ #define __com_sun_star_uri_XVndSunStarExpandUrl_idl__ -#include "com/sun/star/lang/IllegalArgumentException.idl" -#include "com/sun/star/uno/XInterface.idl" +#include +#include module com { module sun { module star { module util { published interface XMacroExpander; diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl index d4effddcf954..14928fb51e52 100644 --- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl +++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl @@ -20,8 +20,8 @@ #ifndef __com_sun_star_uri_VndSunStarExpandUrlReference_idl__ #define __com_sun_star_uri_VndSunStarExpandUrlReference_idl__ -#include "com/sun/star/uri/XUriReference.idl" -#include "com/sun/star/uri/XVndSunStarExpandUrl.idl" +#include +#include module com { module sun { module star { module uri { diff --git a/udkapi/com/sun/star/util/theMacroExpander.idl b/udkapi/com/sun/star/util/theMacroExpander.idl index 38b15fffe1d3..998b498f22ed 100644 --- a/udkapi/com/sun/star/util/theMacroExpander.idl +++ b/udkapi/com/sun/star/util/theMacroExpander.idl @@ -20,7 +20,7 @@ #ifndef __com_sun_star_util_theMacroExpander_idl__ #define __com_sun_star_util_theMacroExpander_idl__ -#include "com/sun/star/util/MacroExpander.idl" +#include module com { module sun { module star { module util { -- cgit