diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
| commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
| tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /udkapi/com/sun/star/task | |
| parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
| parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'udkapi/com/sun/star/task')
6 files changed, 0 insertions, 16 deletions
diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl index e3f675472..158e33372 100644 --- a/udkapi/com/sun/star/task/XInteractionAbort.idl +++ b/udkapi/com/sun/star/task/XInteractionAbort.idl @@ -27,9 +27,7 @@ #ifndef __com_sun_star_task_XInteractionAbort_idl__ #define __com_sun_star_task_XInteractionAbort_idl__ -#ifndef __com_sun_star_task_XInteractionContinuation_idl__ #include <com/sun/star/task/XInteractionContinuation.idl> -#endif //============================================================================= diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl index a56690090..462cfad5b 100644 --- a/udkapi/com/sun/star/task/XInteractionContinuation.idl +++ b/udkapi/com/sun/star/task/XInteractionContinuation.idl @@ -27,9 +27,7 @@ #ifndef __com_sun_star_task_XInteractionContinuation_idl__ #define __com_sun_star_task_XInteractionContinuation_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include <com/sun/star/uno/XInterface.idl> -#endif //============================================================================= diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl index 32c71a43a..66dcf18d3 100644 --- a/udkapi/com/sun/star/task/XInteractionHandler.idl +++ b/udkapi/com/sun/star/task/XInteractionHandler.idl @@ -27,13 +27,9 @@ #ifndef __com_sun_star_task_XInteractionHandler_idl__ #define __com_sun_star_task_XInteractionHandler_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include <com/sun/star/uno/XInterface.idl> -#endif -#ifndef __com_sun_star_task_XInteractionRequest_idl__ #include <com/sun/star/task/XInteractionRequest.idl> -#endif //============================================================================= diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl index 1584e43b7..80c7bb67b 100644 --- a/udkapi/com/sun/star/task/XInteractionHandler2.idl +++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl @@ -27,9 +27,7 @@ #ifndef __com_sun_star_task_XInteractionHandler2_idl__ #define __com_sun_star_task_XInteractionHandler2_idl__ -#ifndef __com_sun_star_task_XInteractionHandler_idl__ #include <com/sun/star/task/XInteractionHandler.idl> -#endif //============================================================================= diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl index 4141c90d4..b9f2889fe 100644 --- a/udkapi/com/sun/star/task/XInteractionRequest.idl +++ b/udkapi/com/sun/star/task/XInteractionRequest.idl @@ -27,13 +27,9 @@ #ifndef __com_sun_star_task_XInteractionRequest_idl__ #define __com_sun_star_task_XInteractionRequest_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include <com/sun/star/uno/XInterface.idl> -#endif -#ifndef __com_sun_star_task_XInteractionContinuation_idl__ #include <com/sun/star/task/XInteractionContinuation.idl> -#endif //============================================================================= diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl index dc0c4e7e2..92568d17a 100644 --- a/udkapi/com/sun/star/task/XInteractionRetry.idl +++ b/udkapi/com/sun/star/task/XInteractionRetry.idl @@ -27,9 +27,7 @@ #ifndef __com_sun_star_task_XInteractionRetry_idl__ #define __com_sun_star_task_XInteractionRetry_idl__ -#ifndef __com_sun_star_task_XInteractionContinuation_idl__ #include <com/sun/star/task/XInteractionContinuation.idl> -#endif //============================================================================= |