diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-17 11:05:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-17 11:06:00 +0100 |
| commit | 9ed364774c6e26e14409bd927e03e6da7fe01b60 (patch) | |
| tree | 42836bfdc7d8727836fe1216d5c6457db2482d74 | |
| parent | fa2a7c1c95f78d20ed572091e12700fd4d852835 (diff) | |
Adapt all (non-extension, SharedLibrary) .components to environment="..."
Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83
222 files changed, 439 insertions, 434 deletions
diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component index 19a903dc9699..ce23fcea887b 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 29503a3c6c86..4b3030edacba 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 30a6cef26abc..252ac899075f 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 38d39c08fe09..849173cea28c 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 c7be231ac030..dde87435b0a7 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 95e99a989541..cbdba1d03578 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 9feb1facd204..3874439f4fc0 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 c410848a1bb4..94e46f9a7fa6 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 a42ddff3eddf..772cd0e5a300 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 ce2c4c55110a..15e99982e151 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 862a56c13069..9f68ee4752de 100644 --- a/canvas/source/cairo/cairocanvas.component +++ b/canvas/source/cairo/cairocanvas.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="cairocanvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="cairocanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.Canvas.Cairo"> <service name="com.sun.star.rendering.Canvas.Cairo"/> </implementation> diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component index 43a335f469f4..a515799d24c9 100644 --- a/canvas/source/directx/directx9canvas.component +++ b/canvas/source/directx/directx9canvas.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="directx9canvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="directx9canvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX9"> <service name="com.sun.star.rendering.SpriteCanvas.DX9"/> </implementation> diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component index 89a12b1f6cec..701c888830bd 100644 --- a/canvas/source/directx/gdipluscanvas.component +++ b/canvas/source/directx/gdipluscanvas.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="gdipluscanvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="gdipluscanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.BitmapCanvas.GDI+"> <service name="com.sun.star.rendering.BitmapCanvas.GDI+"/> </implementation> diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index 84e37ef6670f..514f242b525a 100644 --- a/canvas/source/factory/canvasfactory.component +++ b/canvas/source/factory/canvasfactory.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="canvasfactory" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="canvasfactory" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.CanvasFactory"> <service name="com.sun.star.rendering.CanvasFactory"/> </implementation> diff --git a/canvas/source/opengl/oglcanvas.component b/canvas/source/opengl/oglcanvas.component index bd2d1039cb78..af3dfebaf4a8 100644 --- a/canvas/source/opengl/oglcanvas.component +++ b/canvas/source/opengl/oglcanvas.component @@ -8,8 +8,8 @@ * --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="oglcanvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="oglcanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.OGL"> <service name="com.sun.star.rendering.SpriteCanvas.OGL"/> </implementation> diff --git a/canvas/source/simplecanvas/simplecanvas.component b/canvas/source/simplecanvas/simplecanvas.component index 48c0767b8c7d..2fe54c391ab2 100644 --- a/canvas/source/simplecanvas/simplecanvas.component +++ b/canvas/source/simplecanvas/simplecanvas.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="simplecanvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="simplecanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SimpleCanvas"> <service name="com.sun.star.rendering.SimpleCanvas"/> </implementation> diff --git a/canvas/source/vcl/vclcanvas.component b/canvas/source/vcl/vclcanvas.component index ae6fc5910a81..ecf2fa7b3e77 100644 --- a/canvas/source/vcl/vclcanvas.component +++ b/canvas/source/vcl/vclcanvas.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vclcanvas" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vclcanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.Canvas.VCL"> <service name="com.sun.star.rendering.Canvas.VCL"/> </implementation> diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component index b5550bd66340..5df1a183b55f 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 e800bed57c75..75869e5c222f 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 00d76c66c253..4def104c426c 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 f6876fb0103a..6f41d8aceabb 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 532884dbede6..424b26625ad5 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 158a065efdee..ffbddfa34c6d 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 8eda9a824f69..3f2cea66b783 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 c33e80a7633d..6bd8cb5e38bb 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 ea4e4de2cfe2..3d30023ebe7a 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 e1ccb844e1fb..6fa7fb8e6262 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 8c7413123445..ab8318861416 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 4123f66d79ad..1bde060cbfd9 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 5e9e9d52739b..5470decc20b9 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 90ff01820a4b..84d17a9cbf78 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 8b3e95ddad6c..e6cc96391fc6 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 3b41e02794c7..848112c64e79 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 be63b8eff420..77375695d1cc 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 18bf73cfccc2..9c3e7ad7c6cd 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 ecbd021c4935..4fa186ea2a0e 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 19f4dbf066ed..89164b6e70d8 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 605bf0516982..ebb200954632 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 20013729ed61..b192bebad89d 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 29ab06557db8..cac7384e9bee 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 40d12410b5f8..eebe9b7252b4 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 158087f8f6fb..e4a5c124ff49 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 ea0e12bf619c..60e18fc69420 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 352872ed2892..51a4182e4524 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 513eb6d20326..89b92a297cfb 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 73b65a1c46a4..7dd325ceb445 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 7af3f45568ed..2cf8b93950ea 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 4e279b0a1fb5..0016f1f9eedb 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 c6ca56246386..abe2c77f5d55 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 69cc87dca470..cadfb6a342b7 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 67f482b0b6ce..1ff56cd68724 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 a8fc7714b58a..66ba2d8e0e3b 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 9a135db23b35..d69c4518e5e0 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 2f1d89262a8f..146df69790b5 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 4ea4a2dd2a80..915e3f0bcf8f 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 d97ae38cad59..2fdc916c514a 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 6cda9195c8be..b1fe4b006460 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 db3997c58e65..faca00cefcda 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 39f8d9a1517f..6551a964684b 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 80f8eab7893f..5b588b2c30ac 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 ac823eecf0ba..7faee94cc84d 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 1fdab5080375..454dc44ab532 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 3e1b8918c32e..38f2a2eee4c0 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 57b36bbf10fd..2cbf71d4a744 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 c9feb3d1ce31..6c1580abf854 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 844b6ecec891..37963bb90497 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 4d7c5708079f..7e07ba415f56 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 9b2c8379c47b..5fb9353093db 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 7491e64b86ac..cf91ac5195ca 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 16c4d2d8b262..09f7621c23e6 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 e2b7c1a5c2e0..7f74fca066d5 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 a070985819c8..b409293c4c91 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 c432cb18e1f9..561feedab338 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 35c38703fea5..6fe7af4ebfda 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 ca4edb6daba5..3f41b1211f9d 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 7ef7db553781..f53977ac5330 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 206306285bc2..5b80c68310dd 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 c2d3364c29c8..6674639c91f2 100644 --- a/filter/source/config/cache/filterconfig1.component +++ b/filter/source/config/cache/filterconfig1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="filterconfig1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="filterconfig1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.filter.config.ConfigFlush"> <service name="com.sun.star.document.FilterConfigRefresh"/> </implementation> diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component index 663a445c0d1d..879466efb301 100644 --- a/filter/source/flash/flash.component +++ b/filter/source/flash/flash.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="flash" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="flash" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.Impress.FlashExportDialog"> <service name="com.sun.star.Impress.FlashExportDialog"/> </implementation> diff --git a/filter/source/graphic/graphicfilter.component b/filter/source/graphic/graphicfilter.component index 3082473284a5..b812a1b0479f 100644 --- a/filter/source/graphic/graphicfilter.component +++ b/filter/source/graphic/graphicfilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="graphicfilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="graphicfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.GraphicExportFilter"> <service name="com.sun.star.document.ExportFilter"/> </implementation> diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component index d4e28b3747d9..11691436550e 100644 --- a/filter/source/msfilter/msfilter.component +++ b/filter/source/msfilter/msfilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="msfilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="msfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.vba.VBAMacroResolver"> <service name="com.sun.star.script.vba.VBAMacroResolver"/> </implementation> diff --git a/filter/source/odfflatxml/odfflatxml.component b/filter/source/odfflatxml/odfflatxml.component index 37f1bc339d1b..7fc938227d7e 100644 --- a/filter/source/odfflatxml/odfflatxml.component +++ b/filter/source/odfflatxml/odfflatxml.component @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="odfflatxml" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="odfflatxml" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.filter.OdfFlatXml"> <service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ExportFilter"/> diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component index acffbc95668f..06cee2e4aa27 100644 --- a/filter/source/pdf/pdffilter.component +++ b/filter/source/pdf/pdffilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="pdffilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="pdffilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.PDF.PDFDialog"> <service name="com.sun.star.document.PDFDialog"/> </implementation> diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component index a74520445720..b852c2bd3457 100644 --- a/filter/source/placeware/placeware.component +++ b/filter/source/placeware/placeware.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="placeware" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="placeware" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Impress.PlaceWareExportFilter"> <service name="com.sun.star.document.ExportFilter"/> </implementation> diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component index 1bf7b47f8413..612d523502c9 100644 --- a/filter/source/svg/svgfilter.component +++ b/filter/source/svg/svgfilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="svgfilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svgfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.SVGFilter"> <service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ExportFilter"/> diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component index 1bad1362c4ec..dcd30b0f9244 100644 --- a/filter/source/t602/t602filter.component +++ b/filter/source/t602/t602filter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="t602filter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="t602filter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.T602ImportFilter"> <service name="com.sun.star.document.ExtendedTypeDetection"/> <service name="com.sun.star.document.ImportFilter"/> diff --git a/filter/source/textfilterdetect/textfd.component b/filter/source/textfilterdetect/textfd.component index ae69bc8aab7a..0b0d722cf17d 100644 --- a/filter/source/textfilterdetect/textfd.component +++ b/filter/source/textfilterdetect/textfd.component @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="textfd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="textfd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.filters.PlainTextFilterDetect"> <service name="com.sun.star.document.ExtendedTypeDetection"/> </implementation> diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component index 7510db5b4982..7ef62b7b79dc 100644 --- a/filter/source/xmlfilteradaptor/xmlfa.component +++ b/filter/source/xmlfilteradaptor/xmlfa.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfa" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xmlfa" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.XmlFilterAdaptor"> <service name="com.sun.star.document.ExportFilter"/> <service name="com.sun.star.document.ImportFilter"/> diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component index 23d8d5d0b59a..2543ee98dd64 100644 --- a/filter/source/xmlfilterdetect/xmlfd.component +++ b/filter/source/xmlfilterdetect/xmlfd.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xmlfd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.filters.XMLFilterDetect"> <service name="com.sun.star.document.ExtendedTypeDetection"/> </implementation> diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component index 93144a99552c..7059cc66cd76 100644 --- a/filter/source/xsltdialog/xsltdlg.component +++ b/filter/source/xsltdialog/xsltdlg.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltdlg" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xsltdlg" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ui.XSLTFilterDialog"> <service name="com.sun.star.ui.dialogs.XSLTFilterDialog"/> </implementation> diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component index 0495ad95ed2b..6a91d87c2c19 100644 --- a/filter/source/xsltfilter/xsltfilter.component +++ b/filter/source/xsltfilter/xsltfilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltfilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xsltfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.documentconversion.XSLTFilter"> <service name="com.sun.star.documentconversion.XSLTFilter"/> </implementation> diff --git a/forms/util/frm.component b/forms/util/frm.component index 3c38c3ba2dde..23833eb8e9ad 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 0d8c8a5cd010..5b6ecef20538 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 7ad2926b62df..8aa06e2e6bc6 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 335a63a6f7a9..8804be2a91e9 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 1dc9d4f3abf9..80dac1a9b5fa 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 27e44bdb7d8a..98ae10bcd12f 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 c91114741a7b..9583b17f070c 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 92bfcda9ef9a..00fc4ce3c854 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 2f8be17a0264..4c82cb671e74 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 d230c6a98db2..93bf92db6aad 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 2373006a38e0..d2bf07ea0b02 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 790502938402..12f954fc9e78 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 c5d1262a98c4..ea9298e464a0 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 8749ea37314e..8e2f2c001dca 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 f314b1c7a1ee..92807d4b3dfc 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 ac990192071e..c11b7a7c3b4b 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 d54e1a38de2d..50aa23c87b52 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 28ef844c9c95..a8602150e774 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 4989843c49c6..5ead1c817443 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 54f4655fe259..06b2eafb8d22 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 0025a1cea58d..f6c9776b8494 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 72be99f7fe0c..6691a0173bbe 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 1dc51f44722d..b98b1cd57f36 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 5131b8a61760..304ee2f4021b 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 33dcf1948198..8f48bbbe2f0f 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 064b4597eb93..7b3be6603471 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 459863607d29..bb2058b50d22 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 8c00dfaa2dd7..936625fcda82 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 e3e474bfd5ec..c2a6bf0f4e56 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 9d58d6a350b7..03bb057389a3 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 767429abeeff..bf10d4f9e7c6 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 c4b37285877e..a44d8471da0c 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 20eb9213ea23..861cb6e5a15d 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 ae83d6dad268..d20aae77d3e9 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 93dfa85fbf5f..7bbf766a5895 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 d50ee37d7117..6083144a4111 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 f6c34906ca32..fd0690b62468 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 09ed542c4e69..8a660e38b2a8 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 66dd111fe0d5..f93b25dc6585 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 95c6b503997f..d569cfe9911a 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 5407300240cb..e39e0f908882 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 ea456583bc7c..15b3eb67a12a 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@" + prefix="vbaevents" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="ooo.vba.EventListener"> <service name="ooo.vba.EventListener"/> </implementation> diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component index 09f874e0a46c..6590007ada33 100644 --- a/scripting/util/scriptframe.component +++ b/scripting/util/scriptframe.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="scriptframe" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="scriptframe" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.script.browse.BrowseNodeFactory"> <service name="com.sun.star.script.browse.BrowseNodeFactory"/> <singleton name="com.sun.star.script.browse.theBrowseNodeFactory"/> diff --git a/sd/util/sd.component b/sd/util/sd.component index a5881659edcc..6b9987b594e3 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.DrawingDocument"> <service name="com.sun.star.drawing.DrawingDocument"/> <service name="com.sun.star.drawing.DrawingDocumentFactory"/> diff --git a/sd/util/sdd.component b/sd/util/sdd.component index 4516dd9c5705..9899c985d6cc 100644 --- a/sd/util/sdd.component +++ b/sd/util/sdd.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sdd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sdd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.draw.FormatDetector"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> </implementation> diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component index 83a3ad1971e7..aca7724c625a 100644 --- a/sd/util/sdfilt.component +++ b/sd/util/sdfilt.component @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sdfilt" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sdfilt" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"/> </component> diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component index eaf145c6c6de..d438c31a3acb 100644 --- a/sdext/source/minimizer/minimizer.component +++ b/sdext/source/minimizer/minimizer.component @@ -7,9 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary" - prefix="pptminimizer"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="pptminimizer" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.PresentationMinimizerImp"> <service name="com.sun.star.comp.PresentationMinimizer"/> </implementation> diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index ed5d32dccb2d..396b37ead8cb 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -7,9 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary" - prefix="pdfimport"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="pdfimport" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.libreoffice.comp.documents.HybridPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index ee7d1d63c9f1..b7687ba291f3 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component xmlns="http://openoffice.org/2010/uno-components" - loader="com.sun.star.loader.SharedLibrary" prefix="presenter"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="presenter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.libreoffice.comp.PresenterScreenJob"/> <implementation name="org.libreoffice.comp.PresenterScreenProtocolHandler"> <service name="com.sun.star.frame.ProtocolHandler"/> diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component index dc3150988622..71f60218ec92 100644 --- a/sfx2/util/sfx.component +++ b/sfx2/util/sfx.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sfx" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sfx" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.sfx2.BackingComp"> <service name="com.sun.star.frame.StartModule"/> </implementation> diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component index cf98e44d020d..10b30a665f8d 100644 --- a/shell/source/backends/desktopbe/desktopbe1.component +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="desktopbe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="desktopbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend"> <service name="com.sun.star.configuration.backend.DesktopBackend"/> </implementation> diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component index 1c7b887a1f60..d28f624fa9b3 100644 --- a/shell/source/backends/gconfbe/gconfbe1.component +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="gconfbe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="gconfbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.GconfBackend"> <service name="com.sun.star.configuration.backend.GconfBackend"/> </implementation> diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component index aaa70f9baf45..6217f1833435 100644 --- a/shell/source/backends/kde4be/kde4be1.component +++ b/shell/source/backends/kde4be/kde4be1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="kde4be1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="kde4be1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend"> <service name="com.sun.star.configuration.backend.KDE4Backend"/> </implementation> diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component index acaf8bdf7da1..f2c2bc5c4972 100644 --- a/shell/source/backends/kdebe/kdebe1.component +++ b/shell/source/backends/kdebe/kdebe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="kdebe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="kdebe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.KDEBackend"> <service name="com.sun.star.configuration.backend.KDEBackend"/> </implementation> diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component index 69dee24600e5..b874527b91cb 100644 --- a/shell/source/backends/localebe/localebe1.component +++ b/shell/source/backends/localebe/localebe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="localebe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="localebe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend"> <service name="com.sun.star.configuration.backend.LocaleBackend"/> </implementation> diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component index d91578f249e2..0db6d669557b 100644 --- a/shell/source/backends/macbe/macbe1.component +++ b/shell/source/backends/macbe/macbe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="macbe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="macbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend"> <service name="com.sun.star.configuration.backend.MacOSXBackend"/> </implementation> diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component index 221fc0ab9a71..848b20e85289 100644 --- a/shell/source/backends/wininetbe/wininetbe1.component +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="wininetbe1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="wininetbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend"> <service name="com.sun.star.configuration.backend.WinInetBackend"/> </implementation> diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component index 3872a65204ba..ea9ce04d243c 100644 --- a/shell/source/cmdmail/cmdmail.component +++ b/shell/source/cmdmail/cmdmail.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="cmdmail" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="cmdmail" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.system.SimpleCommandMail"> <service name="com.sun.star.system.SimpleCommandMail"/> </implementation> diff --git a/shell/source/sessioninstall/losessioninstall.component b/shell/source/sessioninstall/losessioninstall.component index 8045b93b92fb..9d63cd5ecca7 100644 --- a/shell/source/sessioninstall/losessioninstall.component +++ b/shell/source/sessioninstall/losessioninstall.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="sessioninstall" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sessioninstall" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.libreoffice.comp.shell.sessioninstall.SyncDbusSessionHelper"> <service name="org.freedesktop.PackageKit.SyncDbusSessionHelper"/> </implementation> diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component index 4e9a000bde44..0530fd5739ca 100644 --- a/shell/source/unix/exec/syssh.component +++ b/shell/source/unix/exec/syssh.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="syssh" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.system.SystemShellExecute"> <service name="com.sun.star.system.SystemShellExecute"/> </implementation> diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component index 2b3d5c0cae49..c37a46ee8830 100644 --- a/shell/source/win32/simplemail/smplmail.component +++ b/shell/source/win32/simplemail/smplmail.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="smplmail" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="smplmail" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.system.SimpleSystemMail"> <service name="com.sun.star.system.SimpleSystemMail"/> </implementation> diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component index d949f3ff9937..b488e16a0c23 100644 --- a/shell/source/win32/syssh.component +++ b/shell/source/win32/syssh.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="syssh" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.system.SystemShellExecute"> <service name="com.sun.star.system.SystemShellExecute"/> </implementation> diff --git a/slideshow/source/engine/OGLTrans/ogltrans.component b/slideshow/source/engine/OGLTrans/ogltrans.component index abb7f8b4e268..20e5e0f07a6c 100644 --- a/slideshow/source/engine/OGLTrans/ogltrans.component +++ b/slideshow/source/engine/OGLTrans/ogltrans.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ogltrans" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ogltrans" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.presentation.OGLTransitionFactory"> <service name="com.sun.star.presentation.TransitionFactory"/> </implementation> diff --git a/slideshow/util/slideshow.component b/slideshow/util/slideshow.component index 54d078dc5801..1cf2cb8933f4 100644 --- a/slideshow/util/slideshow.component +++ b/slideshow/util/slideshow.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="slideshow" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="slideshow" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.presentation.SlideShow"> <service name="com.sun.star.presentation.SlideShow"/> </implementation> diff --git a/sot/util/sot.component b/sot/util/sot.component index cc2bc41cfafd..7fc9cc3b6e20 100644 --- a/sot/util/sot.component +++ b/sot/util/sot.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sot" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sot" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.embed.OLESimpleStorage"> <service name="com.sun.star.embed.OLESimpleStorage"/> </implementation> diff --git a/starmath/util/sm.component b/starmath/util/sm.component index 612f58ed0cbd..2c7507f07f91 100644 --- a/starmath/util/sm.component +++ b/starmath/util/sm.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sm" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Math.FormulaDocument"> <service name="com.sun.star.formula.FormulaProperties"/> </implementation> diff --git a/starmath/util/smd.component b/starmath/util/smd.component index 795428cffaf5..da5fd934b402 100644 --- a/starmath/util/smd.component +++ b/starmath/util/smd.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="smd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="smd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.math.FormatDetector"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> </implementation> diff --git a/stoc/source/corereflection/reflection.component b/stoc/source/corereflection/reflection.component index 4835f31ea6a6..b1ca1a3c77c2 100644 --- a/stoc/source/corereflection/reflection.component +++ b/stoc/source/corereflection/reflection.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="reflection" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="reflection" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.CoreReflection"> <service name="com.sun.star.reflection.CoreReflection"/> <singleton name="com.sun.star.reflection.theCoreReflection"/> diff --git a/stoc/source/inspect/introspection.component b/stoc/source/inspect/introspection.component index 79f16686ea64..52cd9df90e74 100644 --- a/stoc/source/inspect/introspection.component +++ b/stoc/source/inspect/introspection.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="introspection" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="introspection" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.Introspection"> <service name="com.sun.star.beans.Introspection"/> </implementation> diff --git a/stoc/source/invocation/invocation.component b/stoc/source/invocation/invocation.component index d2ca9c492d3d..c5aa8b5a33af 100644 --- a/stoc/source/invocation/invocation.component +++ b/stoc/source/invocation/invocation.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="invocation" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="invocation" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.Invocation"> <service name="com.sun.star.script.Invocation"/> </implementation> diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component b/stoc/source/invocation_adapterfactory/invocadapt.component index 551f4abaac76..85f29833808f 100644 --- a/stoc/source/invocation_adapterfactory/invocadapt.component +++ b/stoc/source/invocation_adapterfactory/invocadapt.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="invocadapt" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="invocadapt" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory"> <service name="com.sun.star.script.InvocationAdapterFactory"/> </implementation> diff --git a/stoc/source/javaloader/javaloader.component b/stoc/source/javaloader/javaloader.component index 5fd7d8671a5f..9299097c4fd0 100644 --- a/stoc/source/javaloader/javaloader.component +++ b/stoc/source/javaloader/javaloader.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="javaloader" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="javaloader" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.JavaComponentLoader"> <service name="com.sun.star.loader.Java"/> <service name="com.sun.star.loader.Java2"/> diff --git a/stoc/source/javavm/javavm.component b/stoc/source/javavm/javavm.component index 570ce4c635d4..04367fad7ee3 100644 --- a/stoc/source/javavm/javavm.component +++ b/stoc/source/javavm/javavm.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="javavm" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="javavm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.JavaVirtualMachine"> <service name="com.sun.star.java.JavaVirtualMachine"/> <singleton name="com.sun.star.java.theJavaVirtualMachine"/> diff --git a/stoc/source/namingservice/namingservice.component b/stoc/source/namingservice/namingservice.component index 0f6a41f4809c..523c0037363b 100644 --- a/stoc/source/namingservice/namingservice.component +++ b/stoc/source/namingservice/namingservice.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="namingservice" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="namingservice" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.NamingService"> <service name="com.sun.star.uno.NamingService"/> </implementation> diff --git a/stoc/source/proxy_factory/proxyfac.component b/stoc/source/proxy_factory/proxyfac.component index 912ed1529d5f..69e573f5e761 100644 --- a/stoc/source/proxy_factory/proxyfac.component +++ b/stoc/source/proxy_factory/proxyfac.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="proxyfac" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="proxyfac" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.reflection.ProxyFactory"> <service name="com.sun.star.reflection.ProxyFactory"/> </implementation> diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component index f61c85aafead..ee62700b3e81 100644 --- a/stoc/util/bootstrap.component +++ b/stoc/util/bootstrap.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="bootstrap" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="bootstrap" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.DLLComponentLoader"> <service name="com.sun.star.loader.SharedLibrary"/> </implementation> diff --git a/stoc/util/stocservices.component b/stoc/util/stocservices.component index 5bd0dd207e64..d94f0acf6f51 100644 --- a/stoc/util/stocservices.component +++ b/stoc/util/stocservices.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="stocservices" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="stocservices" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.TypeConverter"> <service name="com.sun.star.script.Converter"/> </implementation> diff --git a/svgio/svgio.component b/svgio/svgio.component index f9f5f1f81fc3..96065c384276 100644 --- a/svgio/svgio.component +++ b/svgio/svgio.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="svgio" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svgio" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="svgio::svgreader::XSvgParser"> <service name="com.sun.star.graphic.SvgTools"/> </implementation> diff --git a/svl/source/fsstor/fsstorage.component b/svl/source/fsstor/fsstorage.component index 98d36e26d809..6bbb59eade6e 100644 --- a/svl/source/fsstor/fsstorage.component +++ b/svl/source/fsstor/fsstorage.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="fsstorage" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="fsstorage" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.embed.FileSystemStorageFactory"> <service name="com.sun.star.comp.embed.FileSystemStorageFactory"/> <service name="com.sun.star.embed.FileSystemStorageFactory"/> diff --git a/svl/source/passwordcontainer/passwordcontainer.component b/svl/source/passwordcontainer/passwordcontainer.component index 4fe87f693e22..165efbe7d1f7 100644 --- a/svl/source/passwordcontainer/passwordcontainer.component +++ b/svl/source/passwordcontainer/passwordcontainer.component @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="passwordcontainer" +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="passwordcontainer" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="stardiv.svl.PasswordContainer"> <service name="com.sun.star.task.PasswordContainer"/> diff --git a/svl/util/svl.component b/svl/util/svl.component index 7a96b7acb1f7..64c0cd41df02 100644 --- a/svl/util/svl.component +++ b/svl/util/svl.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="svl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.svl.PathService"> <service name="com.sun.star.config.SpecialConfigManager"/> </implementation> diff --git a/svtools/util/svt.component b/svtools/util/svt.component index efc97f93ff50..ee1298f5dfa8 100644 --- a/svtools/util/svt.component +++ b/svtools/util/svt.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="svt" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svt" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.graphic.GraphicProvider"> <service name="com.sun.star.graphic.GraphicProvider"/> </implementation> diff --git a/svx/util/svx.component b/svx/util/svx.component index 943a38a9883c..e5054eb0130c 100644 --- a/svx/util/svx.component +++ b/svx/util/svx.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="svx" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svx" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.GraphicExporter"> <service name="com.sun.star.drawing.GraphicExportFilter"/> </implementation> diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component index 6190b54d3573..3a9d43c229f9 100644 --- a/svx/util/svxcore.component +++ b/svx/util/svxcore.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="svxcore" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="svxcore" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component index c329f73981b0..e5c36cf824ee 100644 --- a/svx/util/textconversiondlgs.component +++ b/svx/util/textconversiondlgs.component @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="textconversiondlgs" +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="textconversiondlgs" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> diff --git a/sw/util/msword.component b/sw/util/msword.component index 6cb98aeaafed..5ae40de08869 100644 --- a/sw/util/msword.component +++ b/sw/util/msword.component @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="msword" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="msword" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.RtfExport"> <service name="com.sun.star.comp.Writer.RtfExport"/> </implementation> diff --git a/sw/util/sw.component b/sw/util/sw.component index 2f7c9998d14f..b125120c8172 100644 --- a/sw/util/sw.component +++ b/sw/util/sw.component @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="sw" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="sw" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="SwXAutoTextContainer"> <service name="com.sun.star.text.AutoTextContainer"/> </implementation> diff --git a/sw/util/swd.component b/sw/util/swd.component index 42af8053f611..a342f059fc25 100644 --- a/sw/util/swd.component +++ b/sw/util/swd.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="swd" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="swd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.writer.FormatDetector"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> <service name="com.sun.star.text.FormatDetector"/> diff --git a/sw/util/vbaswobj.component b/sw/util/vbaswobj.component index 6072fd0cc79a..07cff4402ec1 100644 --- a/sw/util/vbaswobj.component +++ b/sw/util/vbaswobj.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaswobj" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vbaswobj" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="SwVbaDocument"> <service name="ooo.vba.word.Document"/> </implementation> diff --git a/testtools/source/bridgetest/bridgetest.component b/testtools/source/bridgetest/bridgetest.component index cf1f76dc0e38..ecbd2e333d8b 100644 --- a/testtools/source/bridgetest/bridgetest.component +++ b/testtools/source/bridgetest/bridgetest.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.bridge.BridgeTest"> <service name="com.sun.star.test.bridge.BridgeTest"/> diff --git a/testtools/source/bridgetest/constructors.component b/testtools/source/bridgetest/constructors.component index bca21fd10567..ddde0831639a 100644 --- a/testtools/source/bridgetest/constructors.component +++ b/testtools/source/bridgetest/constructors.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="comp.test.testtools.bridgetest.Constructors"> <service name="test.testtools.bridgetest.Constructors"/> diff --git a/testtools/source/bridgetest/cppobj.component b/testtools/source/bridgetest/cppobj.component index a9ffd1c842c9..5b11d8df358b 100644 --- a/testtools/source/bridgetest/cppobj.component +++ b/testtools/source/bridgetest/cppobj.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.bridge.CppTestObject"> <service name="com.sun.star.test.bridge.CppTestObject"/> diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component index 9c8622df1057..f1aee155a63a 100644 --- a/toolkit/util/tk.component +++ b/toolkit/util/tk.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="tk" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="tk" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.awt.comp.AsyncCallback"> <service name="com.sun.star.awt.AsyncCallback"/> </implementation> diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component index 59cd38dcad1c..e2c893230482 100644 --- a/ucb/source/cacher/cached1.component +++ b/ucb/source/cacher/cached1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="cached1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="cached1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.CachedContentResultSetFactory"> <service name="com.sun.star.ucb.CachedContentResultSetFactory"/> </implementation> diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component index 3fce4dfe8b44..71dfa7046501 100644 --- a/ucb/source/core/ucb1.component +++ b/ucb/source/core/ucb1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucb" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucb" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.CommandEnvironment"> <service name="com.sun.star.ucb.CommandEnvironment"/> </implementation> diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component index fb38f62069d5..836be559940c 100644 --- a/ucb/source/sorter/srtrs1.component +++ b/ucb/source/sorter/srtrs1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="srtrs1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="srtrs1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.SortedDynamicResultSetFactory"> <service name="com.sun.star.ucb.SortedDynamicResultSetFactory"/> </implementation> diff --git a/ucb/source/ucp/cmis/ucpcmis1.component b/ucb/source/ucp/cmis/ucpcmis1.component index b2a0e4bb4bc8..5a32d91193a9 100644 --- a/ucb/source/ucp/cmis/ucpcmis1.component +++ b/ucb/source/ucp/cmis/ucpcmis1.component @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpcmis1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpcmis1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.CmisContentProvider"> <service name="com.sun.star.ucb.CmisContentProvider"/> </implementation> diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component index 32887fdabd44..ba7c7e90e005 100644 --- a/ucb/source/ucp/expand/ucpexpand1.component +++ b/ucb/source/ucp/expand/ucpexpand1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpexpand1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpexpand1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.ExpandContentProvider"> <service name="com.sun.star.ucb.ExpandContentProvider"/> </implementation> diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component index 6aad2e7cc227..56d223146ab5 100644 --- a/ucb/source/ucp/ext/ucpext.component +++ b/ucb/source/ucp/ext/ucpext.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpext" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpext" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.openoffice.comp.ucp.ext.ContentProvider"> <service name="com.sun.star.ucb.ExtensionContentProvider"/> </implementation> diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component index 3b8be79de734..53ebf6a0c0de 100644 --- a/ucb/source/ucp/file/ucpfile1.component +++ b/ucb/source/ucp/file/ucpfile1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpfile" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.FileProvider"> <service name="com.sun.star.ucb.FileContentProvider"/> </implementation> diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component index 4b0af66ed2c1..440f89c5de63 100644 --- a/ucb/source/ucp/ftp/ucpftp1.component +++ b/ucb/source/ucp/ftp/ucpftp1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpftp1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpftp1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.FTPContentProvider"> <service name="com.sun.star.ucb.FTPContentProvider"/> </implementation> diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component index 045f951fd130..9fccd965d0ac 100644 --- a/ucb/source/ucp/gio/ucpgio.component +++ b/ucb/source/ucp/gio/ucpgio.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgio1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpgio1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.GIOContentProvider"> <service name="com.sun.star.ucb.GIOContentProvider"/> </implementation> diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component index a738921faa93..47e6e7cb1df1 100644 --- a/ucb/source/ucp/gvfs/ucpgvfs.component +++ b/ucb/source/ucp/gvfs/ucpgvfs.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgvfs1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpgvfs1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.GnomeVFSContentProvider"> <service name="com.sun.star.ucb.GnomeVFSContentProvider"/> </implementation> diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component index ace85c72fee9..6d880b46cf7c 100644 --- a/ucb/source/ucp/hierarchy/ucphier1.component +++ b/ucb/source/ucp/hierarchy/ucphier1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucphier1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucphier1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.HierarchyContentProvider"> <service name="com.sun.star.ucb.HierarchyContentProvider"/> </implementation> diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component index 6501ed9f70ee..4210c6d6669a 100644 --- a/ucb/source/ucp/package/ucppkg1.component +++ b/ucb/source/ucp/package/ucppkg1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucppkg1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucppkg1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.PackageContentProvider"> <service name="com.sun.star.ucb.PackageContentProvider"/> </implementation> diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component index 116407cbd6ab..ebc03a445fbe 100644 --- a/ucb/source/ucp/tdoc/ucptdoc1.component +++ b/ucb/source/ucp/tdoc/ucptdoc1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucptdoc1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucptdoc1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider"> <service name="com.sun.star.ucb.TransientDocumentsContentProvider"/> </implementation> diff --git a/ucb/source/ucp/webdav-neon/ucpdav1.component b/ucb/source/ucp/webdav-neon/ucpdav1.component index 5abdc1b27b92..5bebe253554e 100644 --- a/ucb/source/ucp/webdav-neon/ucpdav1.component +++ b/ucb/source/ucp/webdav-neon/ucpdav1.component @@ -26,8 +26,8 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpdav1" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpdav1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.WebDAVContentProvider"> <service name="com.sun.star.ucb.WebDAVContentProvider"/> </implementation> diff --git a/unotools/util/utl.component b/unotools/util/utl.component index 72e475753a23..ef929f2a9b77 100644 --- a/unotools/util/utl.component +++ b/unotools/util/utl.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="utl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="utl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.io.comp.TempFile"> <service name="com.sun.star.io.TempFile"/> </implementation> diff --git a/unoxml/source/rdf/unordf.component b/unoxml/source/rdf/unordf.component index e6ca594ad6eb..094534153924 100644 --- a/unoxml/source/rdf/unordf.component +++ b/unoxml/source/rdf/unordf.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="unordf" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="unordf" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="CBlankNode"> <service name="com.sun.star.rdf.BlankNode"/> </implementation> diff --git a/unoxml/source/service/unoxml.component b/unoxml/source/service/unoxml.component index 48b2b2857b45..260256b6f8a3 100644 --- a/unoxml/source/service/unoxml.component +++ b/unoxml/source/service/unoxml.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="unoxml" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="unoxml" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.xml.dom.DocumentBuilder"> <service name="com.sun.star.xml.dom.DocumentBuilder"/> </implementation> diff --git a/uui/util/uui.component b/uui/util/uui.component index ce2abb72a683..569ac4a04d4a 100644 --- a/uui/util/uui.component +++ b/uui/util/uui.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="uui" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="uui" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.uui.PasswordContainerInteractionHandler"> <service name="com.sun.star.task.PasswordContainerInteractionHandler"/> diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component index f4fc16823d9c..7f48716f6754 100644 --- a/vbahelper/util/msforms.component +++ b/vbahelper/util/msforms.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="msforms" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="msforms" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="ControlProviderImpl"> <service name="ooo.vba.ControlProvider"/> </implementation> diff --git a/vcl/vcl.android.component b/vcl/vcl.android.component index 53ebfe36e74c..f2adfaa457cd 100644 --- a/vcl/vcl.android.component +++ b/vcl/vcl.android.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.frame.VCLSessionManagerClient"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> diff --git a/vcl/vcl.headless.component b/vcl/vcl.headless.component index 53ebfe36e74c..f2adfaa457cd 100644 --- a/vcl/vcl.headless.component +++ b/vcl/vcl.headless.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.frame.VCLSessionManagerClient"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> diff --git a/vcl/vcl.ios.component b/vcl/vcl.ios.component index 53ebfe36e74c..f2adfaa457cd 100644 --- a/vcl/vcl.ios.component +++ b/vcl/vcl.ios.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.frame.VCLSessionManagerClient"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> diff --git a/vcl/vcl.macosx.component b/vcl/vcl.macosx.component index 5842d9a61500..5ab7436d8def 100644 --- a/vcl/vcl.macosx.component +++ b/vcl/vcl.macosx.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" 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/vcl/vcl.unx.component b/vcl/vcl.unx.component index 35968751b743..d69012780262 100644 --- a/vcl/vcl.unx.component +++ b/vcl/vcl.unx.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.datatransfer.X11ClipboardSupport"> <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/> </implementation> diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component index 921f299440b8..088c4a296156 100644 --- a/vcl/vcl.windows.component +++ b/vcl/vcl.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="vcl" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="vcl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.frame.VCLSessionManagerClient"> <service name="com.sun.star.frame.SessionManagerClient"/> </implementation> diff --git a/winaccessibility/source/service/winaccessibility.component b/winaccessibility/source/service/winaccessibility.component index 71ea6de8bc87..8c61403e0066 100644 --- a/winaccessibility/source/service/winaccessibility.component +++ b/winaccessibility/source/service/winaccessibility.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="iacc2" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="iacc2" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.accessibility.my_sc_implementation.MSAAService"> <service name="com.sun.star.accessibility.MSAAService"/> </implementation> diff --git a/writerfilter/util/writerfilter.component b/writerfilter/util/writerfilter.component index b5deea5cfd25..1f0bdd810031 100644 --- a/writerfilter/util/writerfilter.component +++ b/writerfilter/util/writerfilter.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="writerfilter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="writerfilter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.WriterFilter"> <service name="com.sun.star.document.ExportFilter"/> <service name="com.sun.star.document.ImportFilter"/> diff --git a/writerperfect/source/impress/wpftimpress.component b/writerperfect/source/impress/wpftimpress.component index b7b87c56a264..66424ab35849 100644 --- a/writerperfect/source/impress/wpftimpress.component +++ b/writerperfect/source/impress/wpftimpress.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="wpftimpress" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="wpftimpress" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.libreoffice.comp.Impress.KeynoteImportFilter"> <service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ExtendedTypeDetection"/> diff --git a/writerperfect/util/wpftdraw.component b/writerperfect/util/wpftdraw.component index ec821712e786..d52411659717 100644 --- a/writerperfect/util/wpftdraw.component +++ b/writerperfect/util/wpftdraw.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="wpftdraw" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="wpftdraw" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.CDRImportFilter"> <service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ExtendedTypeDetection"/> diff --git a/writerperfect/util/wpftwriter.component b/writerperfect/util/wpftwriter.component index e36d8675801e..f9c6e4768df7 100644 --- a/writerperfect/util/wpftwriter.component +++ b/writerperfect/util/wpftwriter.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="wpftwriter" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="wpftwriter" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.MSWorksImportFilter"> <service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ExtendedTypeDetection"/> diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component index 1db2845122ad..3df772cee1ae 100644 --- a/xmlhelp/util/ucpchelp1.component +++ b/xmlhelp/util/ucpchelp1.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpchelp" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="ucpchelp" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="CHelpContentProvider"> <service name="com.sun.star.help.XMLHelp"/> <service name="com.sun.star.ucb.HelpContentProvider"/> diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component index 6556457b28fa..05ccc220ea6e 100644 --- a/xmloff/source/transform/xof.component +++ b/xmloff/source/transform/xof.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xof" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xof" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Calc.XMLContentImporter"> <service name="com.sun.star.comp.Calc.XMLContentImporter"/> </implementation> diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 094dbc684ae1..13ae97794f1a 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xo" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xo" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="SchXMLExport.Compact"> <service name="com.sun.star.comp.Chart.XMLExporter"/> </implementation> diff --git a/xmlscript/util/xmlscript.component b/xmlscript/util/xmlscript.component index 51184ca39687..79b518a742e3 100644 --- a/xmlscript/util/xmlscript.component +++ b/xmlscript/util/xmlscript.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlscript" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xmlscript" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler"> <service name="com.sun.star.xml.input.SaxDocumentHandler"/> </implementation> diff --git a/xmlsecurity/util/xmlsecurity.component b/xmlsecurity/util/xmlsecurity.component index b6909a25c4cf..ce19281af5b6 100644 --- a/xmlsecurity/util/xmlsecurity.component +++ b/xmlsecurity/util/xmlsecurity.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlsecurity" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xmlsecurity" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.security.CertificateContainer"> <service name="com.sun.star.security.CertificateContainer"/> </implementation> diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component index 51659945e2e3..632a3acd3c34 100644 --- a/xmlsecurity/util/xsec_fw.component +++ b/xmlsecurity/util/xsec_fw.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_fw" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xsec_fw" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.xml.security.framework.DecryptorImpl"> <service name="com.sun.star.xml.crypto.sax.Decryptor"/> </implementation> diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component index 4a78cafb2a39..cf0bc54dc4e2 100644 --- a/xmlsecurity/util/xsec_xmlsec.component +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component index 6498e83f5f25..36e310f8d223 100644 --- a/xmlsecurity/util/xsec_xmlsec.windows.component +++ b/xmlsecurity/util/xsec_xmlsec.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="xsec_xmlsec" - xmlns="http://openoffice.org/2010/uno-components"> +<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" + prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> |