[Libreoffice-commits] core.git: 3 commits - animations/source avmedia/source avmedia/util basctl/util basic/util canvas/source chart2/source comphelper/util connectivity/source cppcanvas/source cppuhelper/qa cui/util dbaccess/source dbaccess/util desktop/source desktop/test drawinglayer/drawinglayer.component dtrans/source dtrans/util embeddedobj/source embeddedobj/util embedserv/util eventattacher/source extensions/source filter/source forms/util formula/util fpicker/source framework/util hwpfilter/source i18npool/source i18npool/util io/source lingucomponent/source linguistic/source lotuswordpro/util mysqlc/source odk/examples odk/settings oox/util package/source package/util pyuno/source remotebridges/source reportdesign/source reportdesign/util sax/source scaddins/source sccomp/source scripting/source scripting/util sc/util sdext/source sd/util sfx2/util shell/source slideshow/source slideshow/util sot/util starmath/util stoc/source stoc/util svgio/svgio.component svl/source svl/util svtools/util svx/util sw/util testtools/source toolkit/util ucb/source UnoControls/util unotools/util unoxml/source uui/util vbahelper/util vcl/vcl.android.component vcl/vcl.headless.component vcl/vcl.ios.component vcl/vcl.macosx.component vcl/vcl.unx.component vcl/vcl.windows.component winaccessibility/source writerfilter/util writerperfect/source writerperfect/util xmlhelp/util xmloff/source xmloff/util xmlscript/util xmlsecurity/util

Stephan Bergmann sbergman at redhat.com
Tue Dec 17 02:06:22 PST 2013


 UnoControls/util/ctl.component                                                             |    4 ++--
 animations/source/animcore/animcore.component                                              |    4 ++--
 avmedia/source/gstreamer/avmediagstreamer.component                                        |    3 ++-
 avmedia/source/gstreamer/avmediagstreamer_0_10.component                                   |    3 ++-
 avmedia/source/quicktime/avmediaQuickTime.component                                        |    4 ++--
 avmedia/source/vlc/avmediavlc.component                                                    |    3 ++-
 avmedia/source/win/avmediawin.component                                                    |    4 ++--
 avmedia/util/avmedia.component                                                             |    4 ++--
 basctl/util/basctl.component                                                               |    4 ++--
 basic/util/sb.component                                                                    |    4 ++--
 canvas/source/cairo/cairocanvas.component                                                  |    4 ++--
 canvas/source/directx/directx9canvas.component                                             |    4 ++--
 canvas/source/directx/gdipluscanvas.component                                              |    4 ++--
 canvas/source/factory/canvasfactory.component                                              |    4 ++--
 canvas/source/opengl/oglcanvas.component                                                   |    4 ++--
 canvas/source/simplecanvas/simplecanvas.component                                          |    4 ++--
 canvas/source/vcl/vclcanvas.component                                                      |    4 ++--
 chart2/source/chartcore.component                                                          |    4 ++--
 chart2/source/controller/chartcontroller.component                                         |    4 ++--
 comphelper/util/comphelp.component                                                         |    4 ++--
 connectivity/source/cpool/dbpool2.component                                                |    4 ++--
 connectivity/source/dbtools/dbtools.component                                              |    4 ++--
 connectivity/source/drivers/calc/calc.component                                            |    3 ++-
 connectivity/source/drivers/dbase/dbase.component                                          |    4 ++--
 connectivity/source/drivers/evoab2/evoab.component                                         |    4 ++--
 connectivity/source/drivers/firebird/firebird_sdbc.component                               |    4 ++--
 connectivity/source/drivers/flat/flat.component                                            |    4 ++--
 connectivity/source/drivers/hsqldb/hsqldb.component                                        |    4 ++--
 connectivity/source/drivers/kab/kab1.component                                             |    4 ++--
 connectivity/source/drivers/kab/tdeab1.component                                           |    2 +-
 connectivity/source/drivers/macab/macab1.component                                         |    4 ++--
 connectivity/source/drivers/mork/mork.component                                            |    4 ++--
 connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component                         |    4 ++--
 connectivity/source/drivers/mozab/mozab.component                                          |    4 ++--
 connectivity/source/drivers/mysql/mysql.component                                          |    4 ++--
 connectivity/source/drivers/odbc/odbc.component                                            |    4 ++--
 connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component                      |    3 ++-
 connectivity/source/drivers/postgresql/postgresql-sdbc.component                           |    4 ++--
 connectivity/source/manager/sdbc2.component                                                |    4 ++--
 cppcanvas/source/uno/mtfrenderer.component                                                 |    4 ++--
 cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component                           |    4 ++--
 cui/util/cui.component                                                                     |    4 ++--
 dbaccess/source/ext/macromigration/dbmm.component                                          |    4 ++--
 dbaccess/source/filter/xml/dbaxml.component                                                |    4 ++--
 dbaccess/util/dba.component                                                                |    4 ++--
 dbaccess/util/dbu.component                                                                |    4 ++--
 dbaccess/util/sdbt.component                                                               |    4 ++--
 desktop/source/deployment/deployment.component                                             |    4 ++--
 desktop/source/deployment/gui/deploymentgui.component                                      |    4 ++--
 desktop/source/migration/services/migrationoo2.component                                   |    4 ++--
 desktop/source/migration/services/migrationoo3.component                                   |    4 ++--
 desktop/source/offacc/offacc.component                                                     |    4 ++--
 desktop/source/splash/spl.component                                                        |    4 ++--
 desktop/test/deployment/active/active_native.cxx                                           |    8 ++++++++
 desktop/test/deployment/passive/passive_native.cxx                                         |    8 ++++++++
 drawinglayer/drawinglayer.component                                                        |    4 ++--
 dtrans/source/generic/dtrans.component                                                     |    4 ++--
 dtrans/util/dnd.component                                                                  |    4 ++--
 dtrans/util/ftransl.component                                                              |    4 ++--
 dtrans/util/mcnttype.component                                                             |    4 ++--
 dtrans/util/sysdtrans.component                                                            |    4 ++--
 embeddedobj/source/msole/emboleobj.component                                               |    4 ++--
 embeddedobj/source/msole/emboleobj.windows.component                                       |    4 ++--
 embeddedobj/util/embobj.component                                                          |    4 ++--
 embedserv/util/emser.component                                                             |    4 ++--
 eventattacher/source/evtatt.component                                                      |    4 ++--
 extensions/source/abpilot/abp.component                                                    |    4 ++--
 extensions/source/bibliography/bib.component                                               |    4 ++--
 extensions/source/config/ldap/ldapbe2.component                                            |    4 ++--
 extensions/source/dbpilots/dbp.component                                                   |    4 ++--
 extensions/source/logging/log.component                                                    |    4 ++--
 extensions/source/ole/oleautobridge.component                                              |    4 ++--
 extensions/source/plugin/pl.component                                                      |    4 ++--
 extensions/source/propctrlr/pcr.component                                                  |    4 ++--
 extensions/source/resource/res.component                                                   |    4 ++--
 extensions/source/scanner/scn.component                                                    |    4 ++--
 extensions/source/update/check/updchk.uno.component                                        |    4 ++--
 extensions/source/update/feed/updatefeed.component                                         |    4 ++--
 extensions/source/update/ui/updchk.component                                               |    4 ++--
 filter/source/config/cache/filterconfig1.component                                         |    4 ++--
 filter/source/flash/flash.component                                                        |    4 ++--
 filter/source/graphic/graphicfilter.component                                              |    4 ++--
 filter/source/msfilter/msfilter.component                                                  |    4 ++--
 filter/source/odfflatxml/odfflatxml.component                                              |    4 ++--
 filter/source/pdf/pdffilter.component                                                      |    4 ++--
 filter/source/placeware/placeware.component                                                |    4 ++--
 filter/source/svg/svgfilter.component                                                      |    4 ++--
 filter/source/t602/t602filter.component                                                    |    4 ++--
 filter/source/textfilterdetect/textfd.component                                            |    4 ++--
 filter/source/xmlfilteradaptor/xmlfa.component                                             |    4 ++--
 filter/source/xmlfilterdetect/xmlfd.component                                              |    4 ++--
 filter/source/xsltdialog/xsltdlg.component                                                 |    4 ++--
 filter/source/xsltfilter/xsltfilter.component                                              |    4 ++--
 forms/util/frm.component                                                                   |    4 ++--
 formula/util/for.component                                                                 |    4 ++--
 fpicker/source/aqua/fps_aqua.component                                                     |    4 ++--
 fpicker/source/office/fps_office.component                                                 |    4 ++--
 fpicker/source/win32/fps.component                                                         |    4 ++--
 framework/util/fwk.component                                                               |    4 ++--
 framework/util/fwl.component                                                               |    4 ++--
 framework/util/fwm.component                                                               |    4 ++--
 hwpfilter/source/hwp.component                                                             |    4 ++--
 i18npool/source/search/i18nsearch.component                                                |    4 ++--
 i18npool/util/i18npool.component                                                           |    4 ++--
 io/source/io.component                                                                     |    4 ++--
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component                      |    4 ++--
 lingucomponent/source/languageguessing/guesslang.component                                 |    4 ++--
 lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component                         |    4 ++--
 lingucomponent/source/spellcheck/spell/spell.component                                     |    4 ++--
 lingucomponent/source/thesaurus/libnth/lnth.component                                      |    4 ++--
 linguistic/source/lng.component                                                            |    4 ++--
 lotuswordpro/util/lwpfilter.component                                                      |    4 ++--
 mysqlc/source/mysqlc_services.cxx                                                          |    7 +++++++
 odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx      |    8 ++++++++
 odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx                     |    7 +++++++
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx                         |    7 +++++++
 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx |    7 +++++++
 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx     |    7 +++++++
 odk/examples/DevelopersGuide/examples.html                                                 |    4 ++--
 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h                                   |    9 +++------
 odk/examples/cpp/complextoolbarcontrols/exports.cxx                                        |    7 +++++++
 odk/examples/cpp/counter/counter.cxx                                                       |    8 ++++++++
 odk/examples/cpp/custompanel/ctp_services.cxx                                              |    8 ++++++++
 odk/examples/cpp/remoteclient/remoteclient.cxx                                             |    8 ++++++++
 odk/settings/component.uno.def                                                             |    1 +
 oox/util/oox.component                                                                     |    4 ++--
 package/source/xstor/xstor.component                                                       |    4 ++--
 package/util/package2.component                                                            |    4 ++--
 pyuno/source/loader/pythonloader.component                                                 |    4 ++--
 remotebridges/source/unourl_resolver/uuresolver.component                                  |    4 ++--
 reportdesign/source/filter/xml/rptxml.component                                            |    2 +-
 reportdesign/util/rpt.component                                                            |    4 ++--
 reportdesign/util/rptui.component                                                          |    4 ++--
 reportdesign/util/rptxml.component                                                         |    4 ++--
 sax/source/expatwrap/expwrap.component                                                     |    4 ++--
 sc/util/sc.component                                                                       |    4 ++--
 sc/util/scd.component                                                                      |    4 ++--
 sc/util/scfilt.component                                                                   |    4 ++--
 sc/util/vbaobj.component                                                                   |    4 ++--
 scaddins/source/analysis/analysis.component                                                |    4 ++--
 scaddins/source/datefunc/date.component                                                    |    4 ++--
 scaddins/source/pricing/pricing.component                                                  |    4 ++--
 sccomp/source/solver/solver.component                                                      |    4 ++--
 scripting/source/basprov/basprov.component                                                 |    4 ++--
 scripting/source/dlgprov/dlgprov.component                                                 |    4 ++--
 scripting/source/protocolhandler/protocolhandler.component                                 |    4 ++--
 scripting/source/stringresource/stringresource.component                                   |    4 ++--
 scripting/source/vbaevents/vbaevents.component                                             |    4 ++--
 scripting/util/scriptframe.component                                                       |    4 ++--
 sd/util/sd.component                                                                       |    4 ++--
 sd/util/sdd.component                                                                      |    4 ++--
 sd/util/sdfilt.component                                                                   |    4 ++--
 sdext/source/minimizer/minimizer.component                                                 |    5 ++---
 sdext/source/pdfimport/pdfimport.component                                                 |    5 ++---
 sdext/source/presenter/presenter.component                                                 |    4 ++--
 sfx2/util/sfx.component                                                                    |    4 ++--
 shell/source/backends/desktopbe/desktopbe1.component                                       |    4 ++--
 shell/source/backends/gconfbe/gconfbe1.component                                           |    4 ++--
 shell/source/backends/kde4be/kde4be1.component                                             |    4 ++--
 shell/source/backends/kdebe/kdebe1.component                                               |    4 ++--
 shell/source/backends/localebe/localebe1.component                                         |    4 ++--
 shell/source/backends/macbe/macbe1.component                                               |    4 ++--
 shell/source/backends/wininetbe/wininetbe1.component                                       |    4 ++--
 shell/source/cmdmail/cmdmail.component                                                     |    4 ++--
 shell/source/sessioninstall/losessioninstall.component                                     |    4 ++--
 shell/source/unix/exec/syssh.component                                                     |    4 ++--
 shell/source/win32/simplemail/smplmail.component                                           |    4 ++--
 shell/source/win32/syssh.component                                                         |    4 ++--
 slideshow/source/engine/OGLTrans/ogltrans.component                                        |    4 ++--
 slideshow/util/slideshow.component                                                         |    4 ++--
 sot/util/sot.component                                                                     |    4 ++--
 starmath/util/sm.component                                                                 |    4 ++--
 starmath/util/smd.component                                                                |    4 ++--
 stoc/source/corereflection/reflection.component                                            |    4 ++--
 stoc/source/inspect/introspection.component                                                |    4 ++--
 stoc/source/invocation/invocation.component                                                |    4 ++--
 stoc/source/invocation_adapterfactory/invocadapt.component                                 |    4 ++--
 stoc/source/javaloader/javaloader.component                                                |    4 ++--
 stoc/source/javavm/javavm.component                                                        |    4 ++--
 stoc/source/namingservice/namingservice.component                                          |    4 ++--
 stoc/source/proxy_factory/proxyfac.component                                               |    4 ++--
 stoc/util/bootstrap.component                                                              |    4 ++--
 stoc/util/stocservices.component                                                           |    4 ++--
 svgio/svgio.component                                                                      |    4 ++--
 svl/source/fsstor/fsstorage.component                                                      |    4 ++--
 svl/source/passwordcontainer/passwordcontainer.component                                   |    3 ++-
 svl/util/svl.component                                                                     |    4 ++--
 svtools/util/svt.component                                                                 |    4 ++--
 svx/util/svx.component                                                                     |    4 ++--
 svx/util/svxcore.component                                                                 |    4 ++--
 svx/util/textconversiondlgs.component                                                      |    3 ++-
 sw/util/msword.component                                                                   |    4 ++--
 sw/util/sw.component                                                                       |    4 ++--
 sw/util/swd.component                                                                      |    4 ++--
 sw/util/vbaswobj.component                                                                 |    4 ++--
 testtools/source/bridgetest/bridgetest.component                                           |    2 +-
 testtools/source/bridgetest/constructors.component                                         |    2 +-
 testtools/source/bridgetest/cppobj.component                                               |    2 +-
 toolkit/util/tk.component                                                                  |    4 ++--
 ucb/source/cacher/cached1.component                                                        |    4 ++--
 ucb/source/core/ucb1.component                                                             |    4 ++--
 ucb/source/sorter/srtrs1.component                                                         |    4 ++--
 ucb/source/ucp/cmis/ucpcmis1.component                                                     |    4 ++--
 ucb/source/ucp/expand/ucpexpand1.component                                                 |    4 ++--
 ucb/source/ucp/ext/ucpext.component                                                        |    4 ++--
 ucb/source/ucp/file/ucpfile1.component                                                     |    4 ++--
 ucb/source/ucp/ftp/ucpftp1.component                                                       |    4 ++--
 ucb/source/ucp/gio/ucpgio.component                                                        |    4 ++--
 ucb/source/ucp/gvfs/ucpgvfs.component                                                      |    4 ++--
 ucb/source/ucp/hierarchy/ucphier1.component                                                |    4 ++--
 ucb/source/ucp/package/ucppkg1.component                                                   |    4 ++--
 ucb/source/ucp/tdoc/ucptdoc1.component                                                     |    4 ++--
 ucb/source/ucp/webdav-neon/ucpdav1.component                                               |    4 ++--
 unotools/util/utl.component                                                                |    4 ++--
 unoxml/source/rdf/unordf.component                                                         |    4 ++--
 unoxml/source/service/unoxml.component                                                     |    4 ++--
 uui/util/uui.component                                                                     |    4 ++--
 vbahelper/util/msforms.component                                                           |    4 ++--
 vcl/vcl.android.component                                                                  |    4 ++--
 vcl/vcl.headless.component                                                                 |    4 ++--
 vcl/vcl.ios.component                                                                      |    4 ++--
 vcl/vcl.macosx.component                                                                   |    4 ++--
 vcl/vcl.unx.component                                                                      |    4 ++--
 vcl/vcl.windows.component                                                                  |    4 ++--
 winaccessibility/source/service/winaccessibility.component                                 |    4 ++--
 writerfilter/util/writerfilter.component                                                   |    4 ++--
 writerperfect/source/impress/wpftimpress.component                                         |    4 ++--
 writerperfect/util/wpftdraw.component                                                      |    4 ++--
 writerperfect/util/wpftwriter.component                                                    |    4 ++--
 xmlhelp/util/ucpchelp1.component                                                           |    4 ++--
 xmloff/source/transform/xof.component                                                      |    4 ++--
 xmloff/util/xo.component                                                                   |    4 ++--
 xmlscript/util/xmlscript.component                                                         |    4 ++--
 xmlsecurity/util/xmlsecurity.component                                                     |    4 ++--
 xmlsecurity/util/xsec_fw.component                                                         |    4 ++--
 xmlsecurity/util/xsec_xmlsec.component                                                     |    4 ++--
 xmlsecurity/util/xsec_xmlsec.windows.component                                             |    4 ++--
 237 files changed, 535 insertions(+), 442 deletions(-)

New commits:
commit 9ed364774c6e26e14409bd927e03e6da7fe01b60
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 17 11:05:35 2013 +0100

    Adapt all (non-extension, SharedLibrary) .components to environment="..."
    
    Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component
index 19a903d..ce23fce 100644
--- a/UnoControls/util/ctl.component
+++ b/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>
diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
index 29503a3..4b3030e 100644
--- a/animations/source/animcore/animcore.component
+++ b/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>
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
index 30a6cef..252ac89 100644
--- a/avmedia/source/gstreamer/avmediagstreamer.component
+++ b/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>
diff --git a/avmedia/source/gstreamer/avmediagstreamer_0_10.component b/avmedia/source/gstreamer/avmediagstreamer_0_10.component
index 38d39c0..849173c 100644
--- a/avmedia/source/gstreamer/avmediagstreamer_0_10.component
+++ b/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>
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
index c7be231..dde8743 100644
--- a/avmedia/source/quicktime/avmediaQuickTime.component
+++ b/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>
diff --git a/avmedia/source/vlc/avmediavlc.component b/avmedia/source/vlc/avmediavlc.component
index 95e99a9..cbdba1d 100644
--- a/avmedia/source/vlc/avmediavlc.component
+++ b/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>
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
index 9feb1fa..3874439 100644
--- a/avmedia/source/win/avmediawin.component
+++ b/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>
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
index c410848..94e46f9 100644
--- a/avmedia/util/avmedia.component
+++ b/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>
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component
index a42ddff..772cd0e 100644
--- a/basctl/util/basctl.component
+++ b/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>
diff --git a/basic/util/sb.component b/basic/util/sb.component
index ce2c4c5..15e9998 100644
--- a/basic/util/sb.component
+++ b/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"/>
diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component
index 862a56c..9f68ee4 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 43a335f..a515799 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 89a12b1..701c888 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 84e37ef..514f242 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 bd2d103..af3dfeb 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 48c0767..2fe54c3 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 ae6fc59..ecf2fa7 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>
diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component
index b5550bd..5df1a18 100644
--- a/chart2/source/chartcore.component
+++ b/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>
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index e800bed..75869e5 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/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>
diff --git a/comphelper/util/comphelp.component b/comphelper/util/comphelp.component
index 00d76c6..4def104 100644
--- a/comphelper/util/comphelp.component
+++ b/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>
diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component
index f6876fb..6f41d8a 100644
--- a/connectivity/source/cpool/dbpool2.component
+++ b/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>
diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component
index 532884d..424b266 100644
--- a/connectivity/source/dbtools/dbtools.component
+++ b/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>
diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
index 158a065..ffbddfa 100644
--- a/connectivity/source/drivers/calc/calc.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component
index 8eda9a8..3f2cea6 100644
--- a/connectivity/source/drivers/dbase/dbase.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component
index c33e80a..6bd8cb5 100644
--- a/connectivity/source/drivers/evoab2/evoab.component
+++ b/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>
diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component
index ea4e4de..3d30023 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/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>
diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component
index e1ccb84..6fa7fb8 100644
--- a/connectivity/source/drivers/flat/flat.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component
index 8c74131..ab83188 100644
--- a/connectivity/source/drivers/hsqldb/hsqldb.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
index 4123f66..1bde060 100644
--- a/connectivity/source/drivers/kab/kab1.component
+++ b/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>
diff --git a/connectivity/source/drivers/kab/tdeab1.component b/connectivity/source/drivers/kab/tdeab1.component
index 5e9e9d5..5470dec 100644
--- a/connectivity/source/drivers/kab/tdeab1.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component
index 90ff018..84d17a9 100644
--- a/connectivity/source/drivers/macab/macab1.component
+++ b/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>
diff --git a/connectivity/source/drivers/mork/mork.component b/connectivity/source/drivers/mork/mork.component
index 8b3e95d..e6cc963 100644
--- a/connectivity/source/drivers/mork/mork.component
+++ b/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>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
index 3b41e02..848112c 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
+++ b/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>
diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component
index be63b8e..7737569 100644
--- a/connectivity/source/drivers/mozab/mozab.component
+++ b/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>
diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component
index 18bf73c..9c3e7ad 100644
--- a/connectivity/source/drivers/mysql/mysql.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component
index ecbd021..4fa186e 100644
--- a/connectivity/source/drivers/odbc/odbc.component
+++ b/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>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
index 19f4dbf..89164b6 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
+++ b/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"/>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index 605bf05..ebb2009 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/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>
diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component
index 2001372..b192beb 100644
--- a/connectivity/source/manager/sdbc2.component
+++ b/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>
diff --git a/cppcanvas/source/uno/mtfrenderer.component b/cppcanvas/source/uno/mtfrenderer.component
index 29ab065..cac7384 100644
--- a/cppcanvas/source/uno/mtfrenderer.component
+++ b/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>
diff --git a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component b/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component
index 40d1241..eebe9b7 100644
--- a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component
+++ b/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>
diff --git a/cui/util/cui.component b/cui/util/cui.component
index 158087f..e4a5c12 100644
--- a/cui/util/cui.component
+++ b/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>
diff --git a/dbaccess/source/ext/macromigration/dbmm.component b/dbaccess/source/ext/macromigration/dbmm.component
index ea0e12b..60e18fc 100644
--- a/dbaccess/source/ext/macromigration/dbmm.component
+++ b/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>
diff --git a/dbaccess/source/filter/xml/dbaxml.component b/dbaccess/source/filter/xml/dbaxml.component
index 352872e..51a4182 100644
--- a/dbaccess/source/filter/xml/dbaxml.component
+++ b/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>
diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component
index 513eb6d..89b92a2 100644
--- a/dbaccess/util/dba.component
+++ b/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>
diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component
index 73b65a1..7dd325c 100644
--- a/dbaccess/util/dbu.component
+++ b/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>
diff --git a/dbaccess/util/sdbt.component b/dbaccess/util/sdbt.component
index 7af3f45..2cf8b93 100644
--- a/dbaccess/util/sdbt.component
+++ b/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>
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
index 4e279b0..0016f1f 100644
--- a/desktop/source/deployment/deployment.component
+++ b/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"/>
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
index c6ca562..abe2c77 100644
--- a/desktop/source/deployment/gui/deploymentgui.component
+++ b/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>
diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component
index 69cc87d..cadfb6a 100644
--- a/desktop/source/migration/services/migrationoo2.component
+++ b/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>
diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component
index 67f482b..1ff56cd 100644
--- a/desktop/source/migration/services/migrationoo3.component
+++ b/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>
diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component
index a8fc771..66ba2d8 100644
--- a/desktop/source/offacc/offacc.component
+++ b/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>
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
index 9a135db..d69c451 100644
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="spl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="spl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.FirstStart">
     <service name="com.sun.star.task.Job"/>
   </implementation>
diff --git a/drawinglayer/drawinglayer.component b/drawinglayer/drawinglayer.component
index 2f1d892..146df69 100644
--- a/drawinglayer/drawinglayer.component
+++ b/drawinglayer/drawinglayer.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="drawinglayer"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="drawinglayer" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="drawinglayer::unorenderer::XPrimitive2DRenderer">
     <service name="com.sun.star.graphic.Primitive2DTools"/>
   </implementation>
diff --git a/dtrans/source/generic/dtrans.component b/dtrans/source/generic/dtrans.component
index 4ea4a2d..915e3f0 100644
--- a/dtrans/source/generic/dtrans.component
+++ b/dtrans/source/generic/dtrans.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dtrans"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dtrans" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.datatransfer.ClipboardManager">
     <service name="com.sun.star.datatransfer.clipboard.ClipboardManager"/>
   </implementation>
diff --git a/dtrans/util/dnd.component b/dtrans/util/dnd.component
index d97ae38..2fdc916 100644
--- a/dtrans/util/dnd.component
+++ b/dtrans/util/dnd.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dnd"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dnd" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1">
     <service name="com.sun.star.datatransfer.dnd.OleDragSource"/>
   </implementation>
diff --git a/dtrans/util/ftransl.component b/dtrans/util/ftransl.component
index 6cda919..b1fe4b0 100644
--- a/dtrans/util/ftransl.component
+++ b/dtrans/util/ftransl.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ftransl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ftransl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.datatransfer.DataFormatTranslator">
     <service name="com.sun.star.datatransfer.DataFormatTranslator"/>
   </implementation>
diff --git a/dtrans/util/mcnttype.component b/dtrans/util/mcnttype.component
index db3997c..faca00c 100644
--- a/dtrans/util/mcnttype.component
+++ b/dtrans/util/mcnttype.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mcnttype"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mcnttype" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory">
     <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/>
   </implementation>
diff --git a/dtrans/util/sysdtrans.component b/dtrans/util/sysdtrans.component
index 39f8d9a..6551a96 100644
--- a/dtrans/util/sysdtrans.component
+++ b/dtrans/util/sysdtrans.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sysdtrans"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sysdtrans" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.datatransfer.clipboard.ClipboardW32">
     <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
   </implementation>
diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component
index 80f8eab..5b588b2 100644
--- a/embeddedobj/source/msole/emboleobj.component
+++ b/embeddedobj/source/msole/emboleobj.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="emboleobj"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="emboleobj" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory">
     <service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/>
     <service name="com.sun.star.embed.OLEEmbeddedObjectFactory"/>
diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component
index ac823ee..7faee94 100644
--- a/embeddedobj/source/msole/emboleobj.windows.component
+++ b/embeddedobj/source/msole/emboleobj.windows.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="emboleobj"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="emboleobj" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.MSOLEObjectSystemCreator">
     <service name="com.sun.star.comp.embed.MSOLEObjectSystemCreator"/>
     <service name="com.sun.star.embed.MSOLEObjectSystemCreator"/>
diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component
index 1fdab50..454dc44 100644
--- a/embeddedobj/util/embobj.component
+++ b/embeddedobj/util/embobj.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="embobj"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="embobj" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator">
     <service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/>
     <service name="com.sun.star.embed.EmbeddedObjectCreator"/>
diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component
index 3e1b891..38f2a2e 100644
--- a/embedserv/util/emser.component
+++ b/embedserv/util/emser.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="emser"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="emser" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ole.EmbedServer">
     <service name="com.sun.star.document.OleEmbeddedServerRegistration"/>
   </implementation>
diff --git a/eventattacher/source/evtatt.component b/eventattacher/source/evtatt.component
index 57b36bb..2cbf71d 100644
--- a/eventattacher/source/evtatt.component
+++ b/eventattacher/source/evtatt.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="evtatt"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="evtatt" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.EventAttacher">
     <service name="com.sun.star.script.EventAttacher"/>
   </implementation>
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
index c9feb3d..6c1580a 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="abp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="abp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
     <service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
   </implementation>
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
index 844b6ec..37963bb 100644
--- a/extensions/source/bibliography/bib.component
+++ b/extensions/source/bibliography/bib.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="bib"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="bib" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.Bibliography">
     <service name="com.sun.star.frame.Bibliography"/>
     <service name="com.sun.star.frame.FrameLoader"/>
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
index 4d7c570..7e07ba4 100644
--- a/extensions/source/config/ldap/ldapbe2.component
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="ldapbe2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="ldapbe2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
     <service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
   </implementation>
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
index 9b2c837..5fb9353 100644
--- a/extensions/source/dbpilots/dbp.component
+++ b/extensions/source/dbpilots/dbp.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.dbp.OGridWizard">
     <service name="com.sun.star.sdb.GridControlAutoPilot"/>
   </implementation>
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
index 7491e64..cf91ac5 100644
--- a/extensions/source/logging/log.component
+++ b/extensions/source/logging/log.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="log"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="log" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.extensions.ConsoleHandler">
     <service name="com.sun.star.logging.ConsoleHandler"/>
   </implementation>
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
index 16c4d2d..09f7621 100644
--- a/extensions/source/ole/oleautobridge.component
+++ b/extensions/source/ole/oleautobridge.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="oleautobridge"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="oleautobridge" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ole.OleClient">
     <service name="com.sun.star.bridge.OleObjectFactory"/>
     <service name="com.sun.star.bridge.oleautomation.Factory"/>
diff --git a/extensions/source/plugin/pl.component b/extensions/source/plugin/pl.component
index e2b7c1a..7f74fca 100644
--- a/extensions/source/plugin/pl.component
+++ b/extensions/source/plugin/pl.component
@@ -26,8 +26,8 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.PluginManager">
     <service name="com.sun.star.plugin.PluginManager"/>
   </implementation>
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
index a070985..b409293 100644
--- a/extensions/source/propctrlr/pcr.component
+++ b/extensions/source/propctrlr/pcr.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pcr"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pcr" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="StringRepresentation">
     <service name="com.sun.star.inspection.StringRepresentation"/>
   </implementation>
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
index c432cb1..561feed 100644
--- a/extensions/source/resource/res.component
+++ b/extensions/source/resource/res.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="res"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="res" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
     <service name="com.sun.star.resource.OfficeResourceLoader"/>
     <singleton name="com.sun.star.resource.OfficeResourceLoader"/>
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
index 35c3870..6fe7af4 100644
--- a/extensions/source/scanner/scn.component
+++ b/extensions/source/scanner/scn.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="scn"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="scn" xmlns="http://openoffice.org/2010/uno-components">
    <implementation name="com.sun.star.scanner.ScannerManager">
     <service name="com.sun.star.scanner.ScannerManager"/>
   </implementation>
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
index ca4edb6..3f41b12 100644
--- a/extensions/source/update/check/updchk.uno.component
+++ b/extensions/source/update/check/updchk.uno.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updchk"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updchk" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheck">
     <service name="com.sun.star.setup.UpdateCheck"/>
   </implementation>
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
index 7ef7db5..f53977a 100644
--- a/extensions/source/update/feed/updatefeed.component
+++ b/extensions/source/update/feed/updatefeed.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updatefeed"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updatefeed" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateInformationProvider">
     <service name="com.sun.star.deployment.UpdateInformationProvider"/>
   </implementation>
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
index 2063062..5b80c68 100644
--- a/extensions/source/update/ui/updchk.component
+++ b/extensions/source/update/ui/updchk.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="updchkui"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="updchkui" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheckUI">
     <service name="com.sun.star.setup.UpdateCheckUI"/>
   </implementation>
diff --git a/filter/source/config/cache/filterconfig1.component b/filter/source/config/cache/filterconfig1.component
index c2d3364..6674639 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 663a445..879466e 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 3082473..b812a1b 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 d4e28b3..1169143 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 37f1bc3..7fc9382 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 acffbc9..06cee2e 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 a745204..b852c2b 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 1bf7b47..612d523 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 1bad136..dcd30b0 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 ae69bc8..0b0d722 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 7510db5..7ef62b7 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 23d8d5d..2543ee9 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 93144a9..7059cc6 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 0495ad9..6a91d87 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>
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 3c38c3b..23833eb 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="frm"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="frm" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.form.ONavigationBarControl">
     <service name="com.sun.star.form.control.NavigationToolBar"/>
   </implementation>
diff --git a/formula/util/for.component b/formula/util/for.component
index 0d8c8a5..5b6ecef 100644
--- a/formula/util/for.component
+++ b/formula/util/for.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="for"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="for" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="simple.formula.FormulaOpCodeMapperObj">
     <service name="com.sun.star.sheet.FormulaOpCodeMapper"/>
   </implementation>
diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component
index 7ad2926..8aa06e2 100644
--- a/fpicker/source/aqua/fps_aqua.component
+++ b/fpicker/source/aqua/fps_aqua.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_aqua"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fps_aqua" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker">
     <service name="com.sun.star.ui.dialogs.AquaFilePicker"/>
   </implementation>
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
index 335a63a..8804be2 100644
--- a/fpicker/source/office/fps_office.component
+++ b/fpicker/source/office/fps_office.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_office"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fps_office" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.svtools.OfficeFilePicker">
     <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
   </implementation>
diff --git a/fpicker/source/win32/fps.component b/fpicker/source/win32/fps.component
index 1dc9d4f..80dac1a 100644
--- a/fpicker/source/win32/fps.component
+++ b/fpicker/source/win32/fps.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="fps_win32"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fps_win32" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.ui.dialogs.Win32FilePicker">
     <service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
   </implementation>
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index 27e44bd..98ae10b 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fwk"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fwk" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.frame.SessionListener">
     <service name="com.sun.star.frame.SessionListener"/>
   </implementation>
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
index c911147..9583b17 100644
--- a/framework/util/fwl.component
+++ b/framework/util/fwl.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fwl"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fwl" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.framework.LanguageSelectionMenuController">
     <service name="com.sun.star.frame.PopupMenuController"/>
   </implementation>
diff --git a/framework/util/fwm.component b/framework/util/fwm.component
index 92bfcda..00fc4ce 100644
--- a/framework/util/fwm.component
+++ b/framework/util/fwm.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fwm"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="fwm" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.framework.HelpOnStartup">
     <service name="com.sun.star.task.Job"/>
   </implementation>
diff --git a/hwpfilter/source/hwp.component b/hwpfilter/source/hwp.component
index 2f8be17..4c82cb6 100644
--- a/hwpfilter/source/hwp.component
+++ b/hwpfilter/source/hwp.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="hwp"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="hwp" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.comp.hwpimport.HwpImportFilter">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
diff --git a/i18npool/source/search/i18nsearch.component b/i18npool/source/search/i18nsearch.component
index d230c6a..93bf92d 100644
--- a/i18npool/source/search/i18nsearch.component
+++ b/i18npool/source/search/i18nsearch.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="i18nsearch"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="i18nsearch" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.util.TextSearch_i18n">
     <service name="com.sun.star.util.TextSearch"/>
   </implementation>
diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component
index 2373006..d2bf07e 100644
--- a/i18npool/util/i18npool.component
+++ b/i18npool/util/i18npool.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="i18npool"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="i18npool" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.i18n.BreakIterator">
     <service name="com.sun.star.i18n.BreakIterator"/>
   </implementation>
diff --git a/io/source/io.component b/io/source/io.component
index 7905029..12f954f 100644
--- a/io/source/io.component
+++ b/io/source/io.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="io"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="io" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.io.Pump">
     <service name="com.sun.star.io.Pump"/>
   </implementation>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
index c5d1262..ea9298e 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="hyphen"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="hyphen" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.lingu.LibHnjHyphenator">
     <service name="com.sun.star.linguistic2.Hyphenator"/>
   </implementation>
diff --git a/lingucomponent/source/languageguessing/guesslang.component b/lingucomponent/source/languageguessing/guesslang.component
index 8749ea3..8e2f2c0 100644
--- a/lingucomponent/source/languageguessing/guesslang.component
+++ b/lingucomponent/source/languageguessing/guesslang.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="guesslang"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="guesslang" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.lingu2.LanguageGuessing">
     <service name="com.sun.star.linguistic2.LanguageGuessing"/>
   </implementation>
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
index f314b1c..92807d4 100644
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="MacOSXSpell"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="MacOSXSpell" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.lingu.MacOSXSpellChecker">
     <service name="com.sun.star.linguistic2.SpellChecker"/>
   </implementation>
diff --git a/lingucomponent/source/spellcheck/spell/spell.component b/lingucomponent/source/spellcheck/spell/spell.component
index ac99019..c11b7a7 100644
--- a/lingucomponent/source/spellcheck/spell/spell.component
+++ b/lingucomponent/source/spellcheck/spell/spell.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="spell"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="spell" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.lingu.MySpellSpellChecker">
     <service name="com.sun.star.linguistic2.SpellChecker"/>
   </implementation>
diff --git a/lingucomponent/source/thesaurus/libnth/lnth.component b/lingucomponent/source/thesaurus/libnth/lnth.component
index d54e1a3..50aa23c 100644
--- a/lingucomponent/source/thesaurus/libnth/lnth.component
+++ b/lingucomponent/source/thesaurus/libnth/lnth.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="lnth"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="lnth" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.lingu.new.Thesaurus">
     <service name="com.sun.star.linguistic2.Thesaurus"/>
   </implementation>
diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component
index 28ef844..a860215 100644
--- a/linguistic/source/lng.component
+++ b/linguistic/source/lng.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="lng"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="lng" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.lingu2.ConvDicList">
     <service name="com.sun.star.linguistic2.ConversionDictionaryList"/>
   </implementation>
diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component
index 4989843..5ead1c8 100644
--- a/lotuswordpro/util/lwpfilter.component
+++ b/lotuswordpro/util/lwpfilter.component
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component loader="com.sun.star.loader.SharedLibrary" prefix="lotuswordpro"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="lotuswordpro" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
diff --git a/oox/util/oox.component b/oox/util/oox.component
index 54f4655..06b2eaf 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="oox"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="oox" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.oox.core.FastTokenHandler">
     <service name="com.sun.star.xml.sax.FastTokenHandler"/>
   </implementation>
diff --git a/package/source/xstor/xstor.component b/package/source/xstor/xstor.component
index 0025a1c..f6c9776 100644
--- a/package/source/xstor/xstor.component
+++ b/package/source/xstor/xstor.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="xstor"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="xstor" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.StorageFactory">
     <service name="com.sun.star.comp.embed.StorageFactory"/>
     <service name="com.sun.star.embed.StorageFactory"/>
diff --git a/package/util/package2.component b/package/util/package2.component
index 72be99f..6691a01 100644
--- a/package/util/package2.component
+++ b/package/util/package2.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="package2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="package2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.package.zip.ZipFileAccess">
     <service name="com.sun.star.comp.packages.zip.ZipFileAccess"/>
     <service name="com.sun.star.packages.zip.ZipFileAccess"/>
diff --git a/pyuno/source/loader/pythonloader.component b/pyuno/source/loader/pythonloader.component
index 1dc51f4..b98b1cd 100644
--- a/pyuno/source/loader/pythonloader.component
+++ b/pyuno/source/loader/pythonloader.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pythonloader"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pythonloader" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.pyuno.Loader">
     <service name="com.sun.star.loader.Python"/>
   </implementation>
diff --git a/remotebridges/source/unourl_resolver/uuresolver.component b/remotebridges/source/unourl_resolver/uuresolver.component
index 5131b8a..304ee2f 100644
--- a/remotebridges/source/unourl_resolver/uuresolver.component
+++ b/remotebridges/source/unourl_resolver/uuresolver.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="uuresolver"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="uuresolver" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.bridge.UnoUrlResolver">
     <service name="com.sun.star.bridge.UnoUrlResolver"/>
   </implementation>
diff --git a/reportdesign/source/filter/xml/rptxml.component b/reportdesign/source/filter/xml/rptxml.component
index 33dcf19..8f48bbb 100644
--- a/reportdesign/source/filter/xml/rptxml.component
+++ b/reportdesign/source/filter/xml/rptxml.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-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.report.XMLSettingsExporter">
     <service name="com.sun.star.document.ExportFilter"/>
diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component
index 064b459..7b3be66 100644
--- a/reportdesign/util/rpt.component
+++ b/reportdesign/util/rpt.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="rpt"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="rpt" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.report.OFixedLine">
     <service name="com.sun.star.report.FixedLine"/>
   </implementation>
diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component
index 4598636..bb2058b 100644
--- a/reportdesign/util/rptui.component
+++ b/reportdesign/util/rptui.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="rptui"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="rptui" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.report.DataProviderHandler">
     <service name="com.sun.star.report.inspection.DataProviderHandler"/>
   </implementation>
diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component
index 8c00dfa..936625f 100644
--- a/reportdesign/util/rptxml.component
+++ b/reportdesign/util/rptxml.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="rptxml"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="rptxml" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter">
     <service name="com.sun.star.comp.document.ImportFilter"/>
   </implementation>
diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component
index e3e474b..c2a6bf0 100644
--- a/sax/source/expatwrap/expwrap.component
+++ b/sax/source/expatwrap/expwrap.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="expwrap"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="expwrap" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.extensions.xml.sax.ParserExpat">
     <service name="com.sun.star.xml.sax.Parser"/>
   </implementation>
diff --git a/sc/util/sc.component b/sc/util/sc.component
index 9d58d6a..03bb057 100644
--- a/sc/util/sc.component
+++ b/sc/util/sc.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="sc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="sc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Calc.FilterOptionsDialog">
     <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
   </implementation>
diff --git a/sc/util/scd.component b/sc/util/scd.component
index 767429a..bf10d4f 100644
--- a/sc/util/scd.component
+++ b/sc/util/scd.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="scd"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="scd" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.calc.FormatDetector">
     <service name="com.sun.star.frame.ExtendedTypeDetection"/>
   </implementation>
diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component
index c4b3728..a44d847 100644
--- a/sc/util/scfilt.component
+++ b/sc/util/scfilt.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="scfilt"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="scfilt" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.oox.xls.ExcelFilter">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExportFilter"/>
diff --git a/sc/util/vbaobj.component b/sc/util/vbaobj.component
index 20eb921..861cb6e 100644
--- a/sc/util/vbaobj.component
+++ b/sc/util/vbaobj.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaobj"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="vbaobj" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="ScVbaApplication">
     <service name="ooo.vba.excel.Application"/>
   </implementation>
diff --git a/scaddins/source/analysis/analysis.component b/scaddins/source/analysis/analysis.component
index ae83d6d..d20aae7 100644
--- a/scaddins/source/analysis/analysis.component
+++ b/scaddins/source/analysis/analysis.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="analysis"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="analysis" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sheet.addin.AnalysisImpl">
     <service name="com.sun.star.sheet.AddIn"/>
     <service name="com.sun.star.sheet.addin.Analysis"/>
diff --git a/scaddins/source/datefunc/date.component b/scaddins/source/datefunc/date.component
index 93dfa85..7bbf766 100644
--- a/scaddins/source/datefunc/date.component
+++ b/scaddins/source/datefunc/date.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="date"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="date" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sheet.addin.DateFunctionsImpl">
     <service name="com.sun.star.sheet.AddIn"/>
     <service name="com.sun.star.sheet.addin.DateFunctions"/>
diff --git a/scaddins/source/pricing/pricing.component b/scaddins/source/pricing/pricing.component
index d50ee37..6083144 100644
--- a/scaddins/source/pricing/pricing.component
+++ b/scaddins/source/pricing/pricing.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="pricing"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="pricing" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sheet.addin.PricingFunctionsImpl">
     <service name="com.sun.star.sheet.AddIn"/>
     <service name="com.sun.star.sheet.addin.PricingFunctions"/>
diff --git a/sccomp/source/solver/solver.component b/sccomp/source/solver/solver.component
index f6c3490..fd0690b 100644
--- a/sccomp/source/solver/solver.component
+++ b/sccomp/source/solver/solver.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="solver"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="solver" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Calc.Solver">
     <service name="com.sun.star.sheet.Solver"/>
   </implementation>
diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component
index 09ed542..8a660e3 100644
--- a/scripting/source/basprov/basprov.component
+++ b/scripting/source/basprov/basprov.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="basprov"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="basprov" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.scripting.ScriptProviderForBasic">
     <service name="com.sun.star.script.browse.BrowseNode"/>
     <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component
index 66dd111..f93b25d 100644
--- a/scripting/source/dlgprov/dlgprov.component
+++ b/scripting/source/dlgprov/dlgprov.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dlgprov"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dlgprov" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.scripting.DialogProvider">
     <service name="com.sun.star.awt.ContainerWindowProvider"/>
     <service name="com.sun.star.awt.DialogProvider"/>
diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component
index 95c6b50..d569cfe 100644
--- a/scripting/source/protocolhandler/protocolhandler.component
+++ b/scripting/source/protocolhandler/protocolhandler.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="protocolhandler"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="protocolhandler" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ScriptProtocolHandler">
     <service name="com.sun.star.frame.ProtocolHandler"/>
   </implementation>
diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component
index 5407300..e39e0f9 100644
--- a/scripting/source/stringresource/stringresource.component
+++ b/scripting/source/stringresource/stringresource.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="stringresource"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="stringresource" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.scripting.StringResource">
     <service name="com.sun.star.resource.StringResource"/>
   </implementation>
diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component
index ea45658..15b3eb6 100644
--- a/scripting/source/vbaevents/vbaevents.component
+++ b/scripting/source/vbaevents/vbaevents.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaevents"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list