Clean-up uno/lbnames.h

Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919

8 files changed, 11 insertions, 5 deletions

diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 88919edeeef9..cd62d5e01111 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -47,7 +47,6 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 namespace com { namespace sun { namespace star {
     class XEventListener;
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index ab2ebf91ae71..8f722f0a90d3 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -37,6 +37,7 @@
 
 #include <rtl/ustrbuf.hxx>
 
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/implbase1.hxx>
@@ -859,7 +860,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext(
     SAL_THROW(())
 {
     uno::Environment curr_env(Environment::getCurrent());
-    uno::Environment source_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
+    uno::Environment source_env(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
 
     uno::Mapping curr2source(curr_env, source_env);
     uno::Mapping source2curr(source_env, curr_env);
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index a7de5c8deff2..7a3222066c83 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -23,6 +23,7 @@
 #include "osl/doublecheckedlocking.h"
 #include "osl/mutex.hxx"
 #include "uno/dispatcher.hxx"
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "cppuhelper/detail/XExceptionThrower.hpp"
 #include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 24708d91da19..45742962fb0a 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -20,6 +20,7 @@
 
 #include <rtl/bootstrap.hxx>
 
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
@@ -198,7 +199,7 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto
                                                         s_get_service_names() ));
 
     uno::Environment curr_env(Environment::getCurrent());
-    uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
+    uno::Environment target_env(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
 
     uno::Mapping target2curr(target_env, curr_env);
 
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 4af19ec40afa..24bccf291341 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -21,6 +21,7 @@
 
 #include "osl/module.hxx"
 #include "uno/environment.h"
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/shlib.hxx"
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 023e112d1e9b..df6adc6ed28d 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -28,6 +28,7 @@
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
@@ -746,7 +747,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager(
     SAL_THROW(())
 {
     uno::Environment curr_env(Environment::getCurrent());
-    uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
+    uno::Environment target_env(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
 
     uno::Mapping curr2target(curr_env, target_env);
 
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index 27ae9ed2813e..7c566d93fd99 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include "uno/environment.hxx"
+#include <uno/lbnames.h>
 #include "cppu/EnvDcp.hxx"
 #include "cppu/EnvGuards.hxx"
 
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index 999417a57a24..3e5db32d0ad3 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -40,6 +40,7 @@
 #include "cppu/EnvDcp.hxx"
 
 #include <uno/environment.hxx>
+#include <uno/lbnames.h>
 
 using namespace ::com::sun::star;
 
@@ -222,7 +223,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT  void SAL_CALL component_getImplementationEnviro
     else
     {
         char buff[256];
-        strcpy(buff, CPPU_STRINGIFY(CPPU_ENV));
+        strcpy(buff, CPPU_CURRENT_LANGUAGE_BINDING_NAME);
         strcat(buff, purpose.getStr());
 
         *envTypeName = strdup(buff);