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

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

UnoControls/util/ctl.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ctl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ctl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="stardiv.UnoControls.FrameControl">
     <service name="com.sun.star.frame.FrameControl"/>
   </implementation>

animations/source/animcore/animcore.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="animcore"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="animcore" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="animcore::Animate">
     <service name="com.sun.star.animations.Animate"/>
   </implementation>

avmedia/source/gstreamer/avmediagstreamer.component

@@ -7,7 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.media.Manager_GStreamer">
     <service name="com.sun.star.comp.avmedia.Manager_GStreamer"/>
   </implementation>

avmedia/source/gstreamer/avmediagstreamer_0_10.component

@@ -7,7 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.media.Manager_GStreamer_0_10">
     <service name="com.sun.star.comp.avmedia.Manager_GStreamer_0_10"/>
   </implementation>

avmedia/source/quicktime/avmediaQuickTime.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediaQuickTime"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmediaQuickTime" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
     <service name="com.sun.star.media.Manager_QuickTime"/>
   </implementation>

avmedia/source/vlc/avmediavlc.component

@@ -7,7 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediavlc" xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmediavlc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.media.Manager_VLC">
     <service name="com.sun.star.comp.avmedia.Manager_VLC"/>
   </implementation>

avmedia/source/win/avmediawin.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediawin"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmediawin" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
     <service name="com.sun.star.media.Manager_DirectX"/>
   </implementation>

avmedia/util/avmedia.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="avmedia"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="avmedia" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.framework.SoundHandler">
     <service name="com.sun.star.frame.ContentHandler"/>
   </implementation>

basctl/util/basctl.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="basctl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="basctl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.basic.BasicIDE">
     <service name="com.sun.star.script.BasicIDE"/>
   </implementation>

basic/util/sb.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sb"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sb" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
     <service name="com.sun.star.script.DialogLibraryContainer"/>
     <service name="com.sun.star.script.DocumentDialogLibraryContainer"/>

canvas/source/cairo/cairocanvas.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="cairocanvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="cairocanvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.Canvas.Cairo">
     <service name="com.sun.star.rendering.Canvas.Cairo"/>
   </implementation>

canvas/source/directx/directx9canvas.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="directx9canvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="directx9canvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX9">
     <service name="com.sun.star.rendering.SpriteCanvas.DX9"/>
   </implementation>

canvas/source/directx/gdipluscanvas.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="gdipluscanvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="gdipluscanvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.BitmapCanvas.GDI+">
     <service name="com.sun.star.rendering.BitmapCanvas.GDI+"/>
   </implementation>

canvas/source/factory/canvasfactory.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="canvasfactory"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="canvasfactory" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.CanvasFactory">
     <service name="com.sun.star.rendering.CanvasFactory"/>
   </implementation>

canvas/source/opengl/oglcanvas.component

@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="oglcanvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="oglcanvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.SpriteCanvas.OGL">
     <service name="com.sun.star.rendering.SpriteCanvas.OGL"/>
   </implementation>

canvas/source/simplecanvas/simplecanvas.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="simplecanvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="simplecanvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.SimpleCanvas">
     <service name="com.sun.star.rendering.SimpleCanvas"/>
   </implementation>

canvas/source/vcl/vclcanvas.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="vclcanvas"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="vclcanvas" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.Canvas.VCL">
     <service name="com.sun.star.rendering.Canvas.VCL"/>
   </implementation>

chart2/source/chartcore.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="chartcore"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="chartcore" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.chart2.ExponentialScaling">
     <service name="com.sun.star.chart2.ExponentialScaling"/>
   </implementation>

chart2/source/controller/chartcontroller.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="chartcontroller"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="chartcontroller" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>

comphelper/util/comphelp.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="comphelp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="comphelp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="AnyCompareFactory">
     <service name="com.sun.star.ucb.AnyCompareFactory"/>
   </implementation>

connectivity/source/cpool/dbpool2.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbpool2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbpool2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sdbc.OConnectionPool">
     <service name="com.sun.star.sdbc.ConnectionPool"/>
   </implementation>

connectivity/source/dbtools/dbtools.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbtools"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbtools" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet">
     <service name="com.sun.star.sdbc.ResultSet"/>
   </implementation>

connectivity/source/drivers/calc/calc.component

@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="connectivity_calc"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="connectivity_calc"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.calc.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>

connectivity/source/drivers/dbase/dbase.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbase"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbase" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>

connectivity/source/drivers/evoab2/evoab.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="evoab2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="evoab2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/firebird/firebird_sdbc.component

@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="firebird_sdbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/flat/flat.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="flat"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="flat" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.flat.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>

connectivity/source/drivers/hsqldb/hsqldb.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="hsqldb"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="hsqldb" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>

connectivity/source/drivers/kab/kab1.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="kab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="kab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.kab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/kab/tdeab1.component

@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.tdeab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>

connectivity/source/drivers/macab/macab1.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="macab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="macab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.macab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/mork/mork.component

@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mork"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mork" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.MorkDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mozbootstrap"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mozbootstrap" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
     <service name="com.sun.star.mozilla.MozillaBootstrap"/>
   </implementation>

connectivity/source/drivers/mozab/mozab.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mozab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mozab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
     <service name="com.sun.star.mozilla.MozillaBootstrap"/>
   </implementation>

connectivity/source/drivers/mysql/mysql.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mysql"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mysql" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.drivers.MySQL.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>

connectivity/source/drivers/odbc/odbc.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="odbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="odbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.ODBCDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component

@@ -8,7 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc_impl"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="postgresql_sdbc_impl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.connectivity.pq.Connection.noext">
     <service name="com.sun.star.sdbc.Connection"/>

connectivity/source/drivers/postgresql/postgresql-sdbc.component

@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="postgresql_sdbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.connectivity.pq.Driver.noext">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>

connectivity/source/manager/sdbc2.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sdbc2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sdbc2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager">
     <service name="com.sun.star.sdbc.DriverManager"/>
   </implementation>

cppcanvas/source/uno/mtfrenderer.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="mtfrenderer"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mtfrenderer" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.rendering.MtfRenderer">
     <service name="com.sun.star.rendering.MtfRenderer"/>
   </implementation>

cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mixin"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mixin" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="test.cppuhelper.propertysetmixin.comp.CppSupplier">
     <service name="test.cppuhelper.propertysetmixin.CppSupplier"/>
   </implementation>

cui/util/cui.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="cui"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="cui" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.cui.ColorPicker">
     <service name="com.sun.star.ui.dialogs.ColorPicker"/>
   </implementation>

dbaccess/source/ext/macromigration/dbmm.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbmm"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbmm" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService">
     <service name="com.sun.star.sdb.application.MacroMigrationWizard"/>
   </implementation>

dbaccess/source/filter/xml/dbaxml.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbaxml"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbaxml" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdb.DBExportFilter">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>

dbaccess/util/dba.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dba"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dba" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.DatabaseDataProvider">
     <service name="com.sun.star.chart2.data.DatabaseDataProvider"/>
   </implementation>

dbaccess/util/dbu.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbu"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbu" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.DatabaseInteractionHandler">
     <service name="com.sun.star.sdb.DatabaseInteractionHandler"/>
   </implementation>

dbaccess/util/sdbt.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sdbt"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sdbt" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.ConnectionTools">
     <service name="com.sun.star.sdb.tools.ConnectionTools"/>
   </implementation>

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"/>

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>

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>

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>

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>

desktop/source/splash/spl.component

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .