4 files changed, 8 insertions, 8 deletions
diff --git a/sw/util/msword.component b/sw/util/msword.component
index 6cb98aeaafed..5ae40de08869 100644
--- a/sw/util/msword.component
+++ b/sw/util/msword.component
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="msword"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="msword" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Writer.RtfExport">
     <service name="com.sun.star.comp.Writer.RtfExport"/>
   </implementation>
diff --git a/sw/util/sw.component b/sw/util/sw.component
index 2f7c9998d14f..b125120c8172 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sw"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sw" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="SwXAutoTextContainer">
     <service name="com.sun.star.text.AutoTextContainer"/>
   </implementation>
diff --git a/sw/util/swd.component b/sw/util/swd.component
index 42af8053f611..a342f059fc25 100644
--- a/sw/util/swd.component
+++ b/sw/util/swd.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="swd"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="swd" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.writer.FormatDetector">
     <service name="com.sun.star.frame.ExtendedTypeDetection"/>
     <service name="com.sun.star.text.FormatDetector"/>
diff --git a/sw/util/vbaswobj.component b/sw/util/vbaswobj.component
index 6072fd0cc79a..07cff4402ec1 100644
--- a/sw/util/vbaswobj.component
+++ b/sw/util/vbaswobj.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaswobj"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="vbaswobj" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="SwVbaDocument">
     <service name="ooo.vba.word.Document"/>
   </implementation>