Allow setting environment value directly in .component files

...for internal loader="com.sun.star.loader.SharedLibrary" components, instead
of exported component_getImplementationEnvironmen (or implicit
CPPU_CURRENT_LANGUAGE_BINDING_NAME).  Adapted a few .component files as proof-
of-concept, more to follow.

Change-Id: I82332e0a48e6fc1da245990bb72265fe6e58447e

1 files changed, 10 insertions, 5 deletions

diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 78359a2407d7..b68cd4b95edd 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -53,13 +53,15 @@ public:
         struct ImplementationInfo: private boost::noncopyable {
             ImplementationInfo(
                 rtl::OUString const & theName, rtl::OUString const & theLoader,
-                rtl::OUString const & theUri, rtl::OUString const & thePrefix,
+                rtl::OUString const & theUri,
+                rtl::OUString const & theEnvironment,
+                rtl::OUString const & thePrefix,
                 css::uno::Reference< css::uno::XComponentContext > const &
                     theAlienContext,
                 rtl::OUString const & theRdbFile):
                 name(theName), loader(theLoader), uri(theUri),
-                prefix(thePrefix), alienContext(theAlienContext),
-                rdbFile(theRdbFile)
+                environment(theEnvironment), prefix(thePrefix),
+                alienContext(theAlienContext), rdbFile(theRdbFile)
             {}
 
             explicit ImplementationInfo(rtl::OUString const & theName):
@@ -68,6 +70,7 @@ public:
             rtl::OUString const name;
             rtl::OUString const loader;
             rtl::OUString const uri;
+            rtl::OUString const environment;
             rtl::OUString const prefix;
             css::uno::Reference< css::uno::XComponentContext > const
                 alienContext;
@@ -79,13 +82,15 @@ public:
         struct Implementation: private boost::noncopyable {
             Implementation(
                 rtl::OUString const & name, rtl::OUString const & loader,
-                rtl::OUString const & uri, rtl::OUString const & prefix,
+                rtl::OUString const & uri, rtl::OUString const & environment,
+                rtl::OUString const & prefix,
                 css::uno::Reference< css::uno::XComponentContext > const &
                     alienContext,
                 rtl::OUString const & rdbFile):
                 info(
                     new ImplementationInfo(
-                        name, loader, uri, prefix, alienContext, rdbFile)),
+                        name, loader, uri, environment, prefix, alienContext,
+                        rdbFile)),
                 loaded(false)
             {}