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 | a82eae375ecc76c25bb2172424d22bfe479e28d1 (patch) | |
tree | 99fcf65104c29bd4ef436653b4a361f46789b4e7 /udkapi/com/sun/star/lang/ServiceManager.idl | |
parent | a64d0f306856ede0265937969ab5ae0754076ac4 (diff) | |
parent | 08a08dec6e62da86b8e1746bb205cb32ee4c7f98 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'udkapi/com/sun/star/lang/ServiceManager.idl')
-rw-r--r-- | udkapi/com/sun/star/lang/ServiceManager.idl | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/udkapi/com/sun/star/lang/ServiceManager.idl b/udkapi/com/sun/star/lang/ServiceManager.idl index e49e21e8a648..5203b839b14b 100644 --- a/udkapi/com/sun/star/lang/ServiceManager.idl +++ b/udkapi/com/sun/star/lang/ServiceManager.idl @@ -27,37 +27,20 @@ #ifndef __com_sun_star_lang_ServiceManager_idl__ #define __com_sun_star_lang_ServiceManager_idl__ -#ifndef __com_sun_star_lang_MultiServiceFactory_idl__ #include <com/sun/star/lang/MultiServiceFactory.idl> -#endif -#ifndef __com_sun_star_lang_XComponent_idl__ #include <com/sun/star/lang/XComponent.idl> -#endif -#ifndef __com_sun_star_container_XSet_idl__ #include <com/sun/star/container/XSet.idl> -#endif -#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__ #include <com/sun/star/container/XContentEnumerationAccess.idl> -#endif -#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ #include <com/sun/star/lang/XMultiServiceFactory.idl> -#endif - -#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__ #include <com/sun/star/lang/XMultiComponentFactory.idl> -#endif -#ifndef __com_sun_star_lang_XServiceInfo_idl__ #include <com/sun/star/lang/XServiceInfo.idl> -#endif -#ifndef __com_sun_star_beans_XPropertySet_idl__ #include <com/sun/star/beans/XPropertySet.idl> -#endif //============================================================================= |