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

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

12 files changed, 24 insertions, 24 deletions

diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component
index cf98e44d020d..10b30a665f8d 100644
--- a/shell/source/backends/desktopbe/desktopbe1.component
+++ b/shell/source/backends/desktopbe/desktopbe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="desktopbe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="desktopbe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend">
     <service name="com.sun.star.configuration.backend.DesktopBackend"/>
   </implementation>
diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component
index 1c7b887a1f60..d28f624fa9b3 100644
--- a/shell/source/backends/gconfbe/gconfbe1.component
+++ b/shell/source/backends/gconfbe/gconfbe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="gconfbe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="gconfbe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.GconfBackend">
     <service name="com.sun.star.configuration.backend.GconfBackend"/>
   </implementation>
diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component
index aaa70f9baf45..6217f1833435 100644
--- a/shell/source/backends/kde4be/kde4be1.component
+++ b/shell/source/backends/kde4be/kde4be1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="kde4be1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="kde4be1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend">
     <service name="com.sun.star.configuration.backend.KDE4Backend"/>
   </implementation>
diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component
index acaf8bdf7da1..f2c2bc5c4972 100644
--- a/shell/source/backends/kdebe/kdebe1.component
+++ b/shell/source/backends/kdebe/kdebe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="kdebe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="kdebe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.KDEBackend">
     <service name="com.sun.star.configuration.backend.KDEBackend"/>
   </implementation>
diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component
index 69dee24600e5..b874527b91cb 100644
--- a/shell/source/backends/localebe/localebe1.component
+++ b/shell/source/backends/localebe/localebe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="localebe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="localebe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend">
     <service name="com.sun.star.configuration.backend.LocaleBackend"/>
   </implementation>
diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component
index d91578f249e2..0db6d669557b 100644
--- a/shell/source/backends/macbe/macbe1.component
+++ b/shell/source/backends/macbe/macbe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="macbe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="macbe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend">
     <service name="com.sun.star.configuration.backend.MacOSXBackend"/>
   </implementation>
diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component
index 221fc0ab9a71..848b20e85289 100644
--- a/shell/source/backends/wininetbe/wininetbe1.component
+++ b/shell/source/backends/wininetbe/wininetbe1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="wininetbe1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="wininetbe1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend">
     <service name="com.sun.star.configuration.backend.WinInetBackend"/>
   </implementation>
diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component
index 3872a65204ba..ea9ce04d243c 100644
--- a/shell/source/cmdmail/cmdmail.component
+++ b/shell/source/cmdmail/cmdmail.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="cmdmail"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="cmdmail" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.system.SimpleCommandMail">
     <service name="com.sun.star.system.SimpleCommandMail"/>
   </implementation>
diff --git a/shell/source/sessioninstall/losessioninstall.component b/shell/source/sessioninstall/losessioninstall.component
index 8045b93b92fb..9d63cd5ecca7 100644
--- a/shell/source/sessioninstall/losessioninstall.component
+++ b/shell/source/sessioninstall/losessioninstall.component
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sessioninstall"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sessioninstall" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.libreoffice.comp.shell.sessioninstall.SyncDbusSessionHelper">
     <service name="org.freedesktop.PackageKit.SyncDbusSessionHelper"/>
   </implementation>
diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component
index 4e9a000bde44..0530fd5739ca 100644
--- a/shell/source/unix/exec/syssh.component
+++ b/shell/source/unix/exec/syssh.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="syssh" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.system.SystemShellExecute">
     <service name="com.sun.star.system.SystemShellExecute"/>
   </implementation>
diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component
index 2b3d5c0cae49..c37a46ee8830 100644
--- a/shell/source/win32/simplemail/smplmail.component
+++ b/shell/source/win32/simplemail/smplmail.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="smplmail"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="smplmail" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.system.SimpleSystemMail">
     <service name="com.sun.star.system.SimpleSystemMail"/>
   </implementation>
diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component
index d949f3ff9937..b488e16a0c23 100644
--- a/shell/source/win32/syssh.component
+++ b/shell/source/win32/syssh.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="syssh" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.system.SystemShellExecute">
     <service name="com.sun.star.system.SystemShellExecute"/>
   </implementation>