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/io/Pump.idl | |
parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'udkapi/com/sun/star/io/Pump.idl')
-rw-r--r-- | udkapi/com/sun/star/io/Pump.idl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl index 9b935cf34..e716bba56 100644 --- a/udkapi/com/sun/star/io/Pump.idl +++ b/udkapi/com/sun/star/io/Pump.idl @@ -27,17 +27,11 @@ #ifndef __com_sun_star_io_Pipe_idl__ #define __com_sun_star_io_Pipe_idl__ -#ifndef __com_sun_star_io_XActiveDataSource_idl__ #include <com/sun/star/io/XActiveDataSource.idl> -#endif -#ifndef __com_sun_star_io_XActiveDataSink_idl__ #include <com/sun/star/io/XActiveDataSink.idl> -#endif -#ifndef __com_sun_star_io_XActiveDataControl_idl__ #include <com/sun/star/io/XActiveDataControl.idl> -#endif //============================================================================= |