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

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

13 files changed, 26 insertions, 26 deletions

diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
index c9feb3d1ce31..6c1580abf854 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="abp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="abp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
     <service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
   </implementation>
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
index 844b6ecec891..37963bb90497 100644
--- a/extensions/source/bibliography/bib.component
+++ b/extensions/source/bibliography/bib.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="bib"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="bib" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.Bibliography">
     <service name="com.sun.star.frame.Bibliography"/>
     <service name="com.sun.star.frame.FrameLoader"/>
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
index 4d7c5708079f..7e07ba415f56 100644
--- a/extensions/source/config/ldap/ldapbe2.component
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ldapbe2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ldapbe2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
     <service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
   </implementation>
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
index 9b2c8379c47b..5fb9353093db 100644
--- a/extensions/source/dbpilots/dbp.component
+++ b/extensions/source/dbpilots/dbp.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.dbp.OGridWizard">
     <service name="com.sun.star.sdb.GridControlAutoPilot"/>
   </implementation>
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
index 7491e64b86ac..cf91ac5195ca 100644
--- a/extensions/source/logging/log.component
+++ b/extensions/source/logging/log.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="log"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="log" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.extensions.ConsoleHandler">
     <service name="com.sun.star.logging.ConsoleHandler"/>
   </implementation>
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
index 16c4d2d8b262..09f7621c23e6 100644
--- a/extensions/source/ole/oleautobridge.component
+++ b/extensions/source/ole/oleautobridge.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="oleautobridge"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="oleautobridge" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ole.OleClient">
     <service name="com.sun.star.bridge.OleObjectFactory"/>
     <service name="com.sun.star.bridge.oleautomation.Factory"/>
diff --git a/extensions/source/plugin/pl.component b/extensions/source/plugin/pl.component
index e2b7c1a5c2e0..7f74fca066d5 100644
--- a/extensions/source/plugin/pl.component
+++ b/extensions/source/plugin/pl.component
@@ -26,8 +26,8 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.PluginManager">
     <service name="com.sun.star.plugin.PluginManager"/>
   </implementation>
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
index a070985819c8..b409293c4c91 100644
--- a/extensions/source/propctrlr/pcr.component
+++ b/extensions/source/propctrlr/pcr.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pcr"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pcr" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="StringRepresentation">
     <service name="com.sun.star.inspection.StringRepresentation"/>
   </implementation>
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
index c432cb18e1f9..561feedab338 100644
--- a/extensions/source/resource/res.component
+++ b/extensions/source/resource/res.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="res"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="res" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
     <service name="com.sun.star.resource.OfficeResourceLoader"/>
     <singleton name="com.sun.star.resource.OfficeResourceLoader"/>
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
index 35c38703fea5..6fe7af4ebfda 100644
--- a/extensions/source/scanner/scn.component
+++ b/extensions/source/scanner/scn.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="scn"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="scn" xmlns="http://openoffice.org/2010/uno-components">
    <implementation name="com.sun.star.scanner.ScannerManager">
     <service name="com.sun.star.scanner.ScannerManager"/>
   </implementation>
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
index ca4edb6daba5..3f41b1211f9d 100644
--- a/extensions/source/update/check/updchk.uno.component
+++ b/extensions/source/update/check/updchk.uno.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updchk"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updchk" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheck">
     <service name="com.sun.star.setup.UpdateCheck"/>
   </implementation>
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
index 7ef7db553781..f53977ac5330 100644
--- a/extensions/source/update/feed/updatefeed.component
+++ b/extensions/source/update/feed/updatefeed.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updatefeed"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updatefeed" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateInformationProvider">
     <service name="com.sun.star.deployment.UpdateInformationProvider"/>
   </implementation>
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
index 206306285bc2..5b80c68310dd 100644
--- a/extensions/source/update/ui/updchk.component
+++ b/extensions/source/update/ui/updchk.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updchkui"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updchkui" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheckUI">
     <service name="com.sun.star.setup.UpdateCheckUI"/>
   </implementation>