Clean-up uno/lbnames.h

Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919

9 files changed, 8 insertions, 10 deletions

diff --git a/include/cppu/macros.hxx b/include/cppu/macros.hxx
index 86c2b1ead9ba..cc6d93a91a49 100644
--- a/include/cppu/macros.hxx
+++ b/include/cppu/macros.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CPPU_MACROS_HXX
 
 #include <sal/types.h>
-#include <uno/lbnames.h>
 
 /** Namespace name for compiler/ platform, e.g. gcc3, msci */
 #define CPPU_CURRENT_NAMESPACE CPPU_ENV
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index c3edd44e28aa..a6cc8c20a39a 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/linguistic2/XPossibleHyphens.hpp>
 #include <tools/solar.h>
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <linguistic/lngdllapi.h>
 
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index d08258613a65..f1ba3d1e1f73 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_LINGUISTIC_LNGPROPHELP_HXX
 
 #include <tools/solar.h>
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 5bbc3214880d..101ffd4e6ef2 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <unotools/pathoptions.hxx>
 #include <i18nlangtag/lang.h>
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index c4e8348a5f4a..362b8a50fc8c 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -27,7 +27,6 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <linguistic/lngdllapi.h>
 
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index 3019006e4e33..e75f41fb3fe6 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_UNO_CURRENT_CONTEXT_HXX
 
 #include <uno/current_context.h>
+#include <uno/lbnames.h>
 
 #include <com/sun/star/uno/XCurrentContext.hpp>
 
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index cd5db7a672b4..0f4d15bdf66d 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -55,7 +55,7 @@ public:
                           respectively to current C++ Environment.
         @since UDK 3.2.7
     */
-    inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))) SAL_THROW(());
+    inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_CURRENT_LANGUAGE_BINDING_NAME)) SAL_THROW(());
 
     /// @cond INTERNAL
     // these are here to force memory de/allocation to sal lib.
diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h
index bc2afa6cccbd..83a4608925b1 100644
--- a/include/uno/lbnames.h
+++ b/include/uno/lbnames.h
@@ -21,15 +21,16 @@
 
 /* I assume "LB" means "Language Binding" */
 
+#include <sal/config.h>
+
+#include <sal/macros.h>
+
 #ifdef __cplusplus
 
 #ifdef CPPU_ENV
 
-#define CPPU_STRINGIFY_EX( x ) #x
-#define CPPU_STRINGIFY( x ) CPPU_STRINGIFY_EX( x )
-
 /** Name for C++ compiler/ platform, e.g. "gcc3", "msci" */
-#define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV )
+#define CPPU_CURRENT_LANGUAGE_BINDING_NAME SAL_STRINGIFY( CPPU_ENV )
 
 #else
 
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 5f96972433b7..f8828170b955 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppu/unotype.hxx>
 #include <uno/environment.hxx>
+#include <uno/lbnames.h>
 
 typedef struct _typelib_TypeDescription typelib_TypeDescription;
 typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;