diff options
| -rw-r--r-- | stoc/source/inspect/insp.xml | 6 | ||||
| -rw-r--r-- | stoc/source/invocation/inv.xml | 7 | ||||
| -rw-r--r-- | stoc/source/invocation_adapterfactory/invadp.xml | 6 | ||||
| -rw-r--r-- | stoc/source/javaloader/javaloader.xml | 6 | ||||
| -rw-r--r-- | stoc/source/javavm/jen.xml | 6 | ||||
| -rw-r--r-- | stoc/source/namingservice/namingservice.xml | 2 | ||||
| -rw-r--r-- | stoc/source/proxy_factory/proxyfac.xml | 6 |
7 files changed, 17 insertions, 22 deletions
diff --git a/stoc/source/inspect/insp.xml b/stoc/source/inspect/insp.xml index 5ef1f348e8e0..40ab534085b2 100644 --- a/stoc/source/inspect/insp.xml +++ b/stoc/source/inspect/insp.xml @@ -47,7 +47,7 @@ <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/invocation/inv.xml b/stoc/source/invocation/inv.xml index 3ea3c3f55619..f6a7b3cdabe3 100644 --- a/stoc/source/invocation/inv.xml +++ b/stoc/source/invocation/inv.xml @@ -65,9 +65,8 @@ XNameContainer and XEnumerationContainer </component-description> <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu </runtime-module-dependency> - <runtime-module-dependency> sal </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/invocation_adapterfactory/invadp.xml b/stoc/source/invocation_adapterfactory/invadp.xml index b83405c85389..e3b6055d3ff5 100644 --- a/stoc/source/invocation_adapterfactory/invadp.xml +++ b/stoc/source/invocation_adapterfactory/invadp.xml @@ -32,7 +32,7 @@ interface by using an adapter factory instance. <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu </runtime-module-dependency> - <runtime-module-dependency> sal </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/javaloader/javaloader.xml b/stoc/source/javaloader/javaloader.xml index 5f790843c19b..58e04b5b3d33 100644 --- a/stoc/source/javaloader/javaloader.xml +++ b/stoc/source/javaloader/javaloader.xml @@ -28,10 +28,8 @@ <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/javavm/jen.xml b/stoc/source/javavm/jen.xml index a6692e2ef081..d34bc39fa4fc 100644 --- a/stoc/source/javavm/jen.xml +++ b/stoc/source/javavm/jen.xml @@ -32,11 +32,9 @@ the existing vm given back. <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> <runtime-module-dependency> tl(COM) </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/namingservice/namingservice.xml b/stoc/source/namingservice/namingservice.xml index 22efbd1e2f7d..469323229606 100644 --- a/stoc/source/namingservice/namingservice.xml +++ b/stoc/source/namingservice/namingservice.xml @@ -28,7 +28,7 @@ The naming service allows the registration and retrieval of objects. <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> <runtime-module-dependency> cppu2 </runtime-module-dependency> <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/stoc/source/proxy_factory/proxyfac.xml b/stoc/source/proxy_factory/proxyfac.xml index 6cb6e693985a..78876f76a754 100644 --- a/stoc/source/proxy_factory/proxyfac.xml +++ b/stoc/source/proxy_factory/proxyfac.xml @@ -29,7 +29,7 @@ original target interfaces on queryInterface() calls. <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu </runtime-module-dependency> - <runtime-module-dependency> sal </runtime-module-dependency> + <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> |