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

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

7 files changed, 14 insertions, 14 deletions

diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component
index 862a56c13069..9f68ee4752de 100644
--- a/canvas/source/cairo/cairocanvas.component
+++ b/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>
diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component
index 43a335f469f4..a515799d24c9 100644
--- a/canvas/source/directx/directx9canvas.component
+++ b/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>
diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component
index 89a12b1f6cec..701c888830bd 100644
--- a/canvas/source/directx/gdipluscanvas.component
+++ b/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>
diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component
index 84e37ef6670f..514f242b525a 100644
--- a/canvas/source/factory/canvasfactory.component
+++ b/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>
diff --git a/canvas/source/opengl/oglcanvas.component b/canvas/source/opengl/oglcanvas.component
index bd2d1039cb78..af3dfebaf4a8 100644
--- a/canvas/source/opengl/oglcanvas.component
+++ b/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>
diff --git a/canvas/source/simplecanvas/simplecanvas.component b/canvas/source/simplecanvas/simplecanvas.component
index 48c0767b8c7d..2fe54c391ab2 100644
--- a/canvas/source/simplecanvas/simplecanvas.component
+++ b/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>
diff --git a/canvas/source/vcl/vclcanvas.component b/canvas/source/vcl/vclcanvas.component
index ae6fc5910a81..ecf2fa7b3e77 100644
--- a/canvas/source/vcl/vclcanvas.component
+++ b/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>