14 files changed, 28 insertions, 28 deletions
diff --git a/filter/source/config/cache/filterconfig1.component b/filter/source/config/cache/filterconfig1.component
index c2d3364c29c8..6674639c91f2 100644
--- a/filter/source/config/cache/filterconfig1.component
+++ b/filter/source/config/cache/filterconfig1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="filterconfig1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="filterconfig1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.filter.config.ConfigFlush">
     <service name="com.sun.star.document.FilterConfigRefresh"/>
   </implementation>
diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component
index 663a445c0d1d..879466efb301 100644
--- a/filter/source/flash/flash.component
+++ b/filter/source/flash/flash.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="flash"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="flash" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.Impress.FlashExportDialog">
     <service name="com.sun.star.Impress.FlashExportDialog"/>
   </implementation>
diff --git a/filter/source/graphic/graphicfilter.component b/filter/source/graphic/graphicfilter.component
index 3082473284a5..b812a1b0479f 100644
--- a/filter/source/graphic/graphicfilter.component
+++ b/filter/source/graphic/graphicfilter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="graphicfilter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="graphicfilter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.GraphicExportFilter">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component
index d4e28b3747d9..11691436550e 100644
--- a/filter/source/msfilter/msfilter.component
+++ b/filter/source/msfilter/msfilter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="msfilter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="msfilter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.vba.VBAMacroResolver">
     <service name="com.sun.star.script.vba.VBAMacroResolver"/>
   </implementation>
diff --git a/filter/source/odfflatxml/odfflatxml.component b/filter/source/odfflatxml/odfflatxml.component
index 37f1bc339d1b..7fc938227d7e 100644
--- a/filter/source/odfflatxml/odfflatxml.component
+++ b/filter/source/odfflatxml/odfflatxml.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="odfflatxml"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="odfflatxml" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.filter.OdfFlatXml">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component
index acffbc95668f..06cee2e4aa27 100644
--- a/filter/source/pdf/pdffilter.component
+++ b/filter/source/pdf/pdffilter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pdffilter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pdffilter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.PDF.PDFDialog">
     <service name="com.sun.star.document.PDFDialog"/>
   </implementation>
diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component
index a74520445720..b852c2bd3457 100644
--- a/filter/source/placeware/placeware.component
+++ b/filter/source/placeware/placeware.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="placeware"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="placeware" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Impress.PlaceWareExportFilter">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component
index 1bf7b47f8413..612d523502c9 100644
--- a/filter/source/svg/svgfilter.component
+++ b/filter/source/svg/svgfilter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="svgfilter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="svgfilter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Draw.SVGFilter">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component
index 1bad1362c4ec..dcd30b0f9244 100644
--- a/filter/source/t602/t602filter.component
+++ b/filter/source/t602/t602filter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="t602filter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="t602filter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Writer.T602ImportFilter">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
     <service name="com.sun.star.document.ImportFilter"/>
diff --git a/filter/source/textfilterdetect/textfd.component b/filter/source/textfilterdetect/textfd.component
index ae69bc8aab7a..0b0d722cf17d 100644
--- a/filter/source/textfilterdetect/textfd.component
+++ b/filter/source/textfilterdetect/textfd.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="textfd"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="textfd" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.filters.PlainTextFilterDetect">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
   </implementation>
diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component
index 7510db5b4982..7ef62b7b79dc 100644
--- a/filter/source/xmlfilteradaptor/xmlfa.component
+++ b/filter/source/xmlfilteradaptor/xmlfa.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfa"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="xmlfa" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Writer.XmlFilterAdaptor">
     <service name="com.sun.star.document.ExportFilter"/>
     <service name="com.sun.star.document.ImportFilter"/>
diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component
index 23d8d5d0b59a..2543ee98dd64 100644
--- a/filter/source/xmlfilterdetect/xmlfd.component
+++ b/filter/source/xmlfilterdetect/xmlfd.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfd"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="xmlfd" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.filters.XMLFilterDetect">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
   </implementation>
diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component
index 93144a99552c..7059cc66cd76 100644
--- a/filter/source/xsltdialog/xsltdlg.component
+++ b/filter/source/xsltdialog/xsltdlg.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltdlg"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="xsltdlg" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ui.XSLTFilterDialog">
     <service name="com.sun.star.ui.dialogs.XSLTFilterDialog"/>
   </implementation>
diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component
index 0495ad95ed2b..6a91d87c2c19 100644
--- a/filter/source/xsltfilter/xsltfilter.component
+++ b/filter/source/xsltfilter/xsltfilter.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltfilter"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="xsltfilter" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.documentconversion.XSLTFilter">
     <service name="com.sun.star.documentconversion.XSLTFilter"/>
   </implementation>