11 files changed, 22 insertions, 22 deletions
diff --git a/ucb/source/ucp/cmis/ucpcmis1.component b/ucb/source/ucp/cmis/ucpcmis1.component
index b2a0e4bb4bc8..5a32d91193a9 100644
--- a/ucb/source/ucp/cmis/ucpcmis1.component
+++ b/ucb/source/ucp/cmis/ucpcmis1.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="ucpcmis1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpcmis1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.CmisContentProvider">
     <service name="com.sun.star.ucb.CmisContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component
index 32887fdabd44..ba7c7e90e005 100644
--- a/ucb/source/ucp/expand/ucpexpand1.component
+++ b/ucb/source/ucp/expand/ucpexpand1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpexpand1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpexpand1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.ExpandContentProvider">
     <service name="com.sun.star.ucb.ExpandContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component
index 6aad2e7cc227..56d223146ab5 100644
--- a/ucb/source/ucp/ext/ucpext.component
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpext"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpext" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.ucp.ext.ContentProvider">
     <service name="com.sun.star.ucb.ExtensionContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component
index 3b8be79de734..53ebf6a0c0de 100644
--- a/ucb/source/ucp/file/ucpfile1.component
+++ b/ucb/source/ucp/file/ucpfile1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpfile" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.FileProvider">
     <service name="com.sun.star.ucb.FileContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component
index 4b0af66ed2c1..440f89c5de63 100644
--- a/ucb/source/ucp/ftp/ucpftp1.component
+++ b/ucb/source/ucp/ftp/ucpftp1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpftp1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpftp1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.FTPContentProvider">
     <service name="com.sun.star.ucb.FTPContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component
index 045f951fd130..9fccd965d0ac 100644
--- a/ucb/source/ucp/gio/ucpgio.component
+++ b/ucb/source/ucp/gio/ucpgio.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgio1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpgio1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.GIOContentProvider">
     <service name="com.sun.star.ucb.GIOContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component
index a738921faa93..47e6e7cb1df1 100644
--- a/ucb/source/ucp/gvfs/ucpgvfs.component
+++ b/ucb/source/ucp/gvfs/ucpgvfs.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgvfs1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpgvfs1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.GnomeVFSContentProvider">
     <service name="com.sun.star.ucb.GnomeVFSContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component
index ace85c72fee9..6d880b46cf7c 100644
--- a/ucb/source/ucp/hierarchy/ucphier1.component
+++ b/ucb/source/ucp/hierarchy/ucphier1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucphier1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucphier1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.HierarchyContentProvider">
     <service name="com.sun.star.ucb.HierarchyContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component
index 6501ed9f70ee..4210c6d6669a 100644
--- a/ucb/source/ucp/package/ucppkg1.component
+++ b/ucb/source/ucp/package/ucppkg1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucppkg1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucppkg1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.PackageContentProvider">
     <service name="com.sun.star.ucb.PackageContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component
index 116407cbd6ab..ebc03a445fbe 100644
--- a/ucb/source/ucp/tdoc/ucptdoc1.component
+++ b/ucb/source/ucp/tdoc/ucptdoc1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucptdoc1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucptdoc1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider">
     <service name="com.sun.star.ucb.TransientDocumentsContentProvider"/>
   </implementation>
diff --git a/ucb/source/ucp/webdav-neon/ucpdav1.component b/ucb/source/ucp/webdav-neon/ucpdav1.component
index 5abdc1b27b92..5bebe253554e 100644
--- a/ucb/source/ucp/webdav-neon/ucpdav1.component
+++ b/ucb/source/ucp/webdav-neon/ucpdav1.component
@@ -26,8 +26,8 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpdav1"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ucpdav1" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.WebDAVContentProvider">
     <service name="com.sun.star.ucb.WebDAVContentProvider"/>
   </implementation>