Adapt all (non-extension, SharedLibrary) .components to environment="..."

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

6 files changed, 12 insertions, 12 deletions

diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
index 4e279b0a1fb5..0016f1f9eedb 100644
--- a/desktop/source/deployment/deployment.component
+++ b/desktop/source/deployment/deployment.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="deployment"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="deployment" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.deployment.ExtensionManager">
     <service name="com.sun.star.comp.deployment.ExtensionManager"/>
     <singleton name="com.sun.star.deployment.ExtensionManager"/>
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
index c6ca56246386..abe2c77f5d55 100644
--- a/desktop/source/deployment/gui/deploymentgui.component
+++ b/desktop/source/deployment/gui/deploymentgui.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="deploymentgui"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="deploymentgui" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.deployment.ui.LicenseDialog">
     <service name="com.sun.star.deployment.ui.LicenseDialog"/>
   </implementation>
diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component
index 69cc87dca470..cadfb6a342b7 100644
--- a/desktop/source/migration/services/migrationoo2.component
+++ b/desktop/source/migration/services/migrationoo2.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="migrationoo2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.migration.Basic">
     <service name="com.sun.star.migration.Basic"/>
   </implementation>
diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component
index 67f482b0b6ce..1ff56cd68724 100644
--- a/desktop/source/migration/services/migrationoo3.component
+++ b/desktop/source/migration/services/migrationoo3.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo3"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="migrationoo3" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions">
     <service name="com.sun.star.migration.Extensions"/>
   </implementation>
diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component
index a8fc7714b58a..66ba2d8e0e3b 100644
--- a/desktop/source/offacc/offacc.component
+++ b/desktop/source/offacc/offacc.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="offacc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="offacc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.office.comp.Acceptor">
     <service name="com.sun.star.office.Acceptor"/>
   </implementation>
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
index 9a135db23b35..d69c4518e5e0 100644
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="spl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="spl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.FirstStart">
     <service name="com.sun.star.task.Job"/>
   </implementation>