Clean-up uno/lbnames.h

Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919

bridges/inc/bridges/cpp_uno/bridge.hxx

@@ -25,7 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/genfunc.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
-
+#include <uno/lbnames.h>
 
 namespace CPPU_CURRENT_NAMESPACE
 {

bridges/test/java_uno/acquire/testacquire.cxx

@@ -46,7 +46,6 @@
 #include "test/javauno/acquire/XDerived.hpp"
 #include "test/javauno/acquire/XTest.hpp"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include <iostream>
 #include <cstdlib>

bridges/test/java_uno/any/transport.cxx

@@ -20,6 +20,7 @@
 
 #include "jni.h"
 
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "uno/environment.hxx"
 #include "jvmaccess/virtualmachine.hxx"

bridges/test/java_uno/equals/testequals.cxx

@@ -45,7 +45,6 @@
 #include "test/java_uno/equals/XDerived.hpp"
 #include "test/java_uno/equals/XTestInterface.hpp"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 namespace {
 

bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx

@@ -42,7 +42,6 @@
 #include "osl/thread.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 #include <iostream>
 

bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx

@@ -39,7 +39,6 @@
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 namespace {
 

cli_ure/source/native/native_share.h

@@ -21,6 +21,7 @@
 #using "cli_uretypes.dll"
 
 #include "rtl/ustring.hxx"
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 
 #include <vcclr.h>

connectivity/source/drivers/ado/Aservices.cxx

@@ -19,6 +19,7 @@
 
 #include "ado/ADriver.hxx"
 #include <cppuhelper/factory.hxx>
+#include <uno/lbnames.h>
 
 using namespace connectivity::ado;
 using ::com::sun::star::uno::Reference;

connectivity/source/drivers/jdbc/jservices.cxx

@@ -19,6 +19,7 @@
 
 #include "java/sql/Driver.hxx"
 #include <cppuhelper/factory.hxx>
+#include <uno/lbnames.h>
 
 using namespace connectivity;
 using ::com::sun::star::uno::Reference;

cppu/source/threadpool/current.cxx

@@ -24,7 +24,6 @@
 
 #include "uno/environment.hxx"
 #include "uno/mapping.hxx"
-#include "uno/lbnames.h"
 #include "typelib/typedescription.h"
 
 #include "current.hxx"

cppu/source/uno/EnvStack.cxx

@@ -18,6 +18,7 @@
  */
 
 #include "uno/environment.hxx"
+#include <uno/lbnames.h>
 
 #include "cppu/EnvDcp.hxx"
 #include "cppu/Enterable.hxx"

cppu/source/uno/cascade_mapping.cxx

@@ -20,6 +20,7 @@
 #include "osl/interlck.h"
 #include "rtl/ustring.hxx"
 #include "uno/environment.hxx"
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "uno/dispatcher.h"
 

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;

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);

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"

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);
 

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"

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);
 

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"
 

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);

desktop/test/deployment/active/active_native.cxx

@@ -54,7 +54,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/log.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 namespace {
 

desktop/test/deployment/passive/passive_native.cxx

@@ -51,7 +51,6 @@
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 namespace {
 

forms/source/misc/services.cxx

@@ -20,7 +20,6 @@
 #include "services.hxx"
 #include "frm_module.hxx"
 #include <cppuhelper/factory.hxx>
-#include <uno/lbnames.h>
 #include <osl/diagnose.h>
 #include <uno/mapping.hxx>
 

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

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>
 

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>

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>

include/linguistic/spelldta.hxx

@@ -27,7 +27,6 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <linguistic/lngdllapi.h>
 

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>
 

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.

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
 

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;

javaunohelper/source/bootstrap.cxx

@@ -25,6 +25,7 @@
 #include "rtl/bootstrap.hxx"
 #include "rtl/string.hxx"
 
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "uno/environment.hxx"
 

javaunohelper/source/javaunohelper.cxx

@@ -23,6 +23,7 @@
 #include <osl/module.h>
 
 #include <uno/environment.hxx>
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>

lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx

@@ -21,7 +21,6 @@
 #ifndef _LINGU2_HYPHENIMP_HXX_
 #define _LINGU2_HYPHENIMP_HXX_
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>

lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx

@@ -20,7 +20,6 @@
 #ifndef _MACSPELLIMP_H_
 #define _MACSPELLIMP_H_
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase6.hxx>
 

lingucomponent/source/spellcheck/spell/sspellimp.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>

lingucomponent/source/thesaurus/libnth/nthesdta.hxx

@@ -25,7 +25,6 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 
 

lingucomponent/source/thesaurus/libnth/nthesimp.hxx

@@ -20,7 +20,6 @@
 #ifndef _LINGU2_THESIMP_HXX_
 #define _LINGU2_THESIMP_HXX_
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/uno/Reference.h>

linguistic/inc/iprcache.hxx

@@ -20,8 +20,6 @@
 #ifndef INCLUDED_LINGUISTIC_INC_IPRCACHE_HXX
 #define INCLUDED_LINGUISTIC_INC_IPRCACHE_HXX
 
-
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 
 #include <com/sun/star/uno/Reference.h>

linguistic/source/dicimp.hxx

@@ -24,7 +24,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.h>

linguistic/source/dlistimp.hxx

@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>

linguistic/source/hyphdsp.hxx

@@ -30,7 +30,6 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 
 #include <boost/shared_ptr.hpp>

linguistic/source/lngopt.cxx

@@ -25,7 +25,6 @@
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 
 #include <cppuhelper/factory.hxx>

linguistic/source/lngopt.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX
 #define INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

linguistic/source/lngsvcmgr.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_LINGUISTIC_SOURCE_LNGSVCMGR_HXX
 #define INCLUDED_LINGUISTIC_SOURCE_LNGSVCMGR_HXX
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>
 

linguistic/source/spelldsp.hxx

@@ -24,7 +24,6 @@
 #include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase7.hxx>

linguistic/source/thesdsp.hxx

@@ -32,7 +32,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.h>

linguistic/workben/sprophelp.hxx

@@ -22,7 +22,6 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>

linguistic/workben/sspellimp.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX
 #define INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX
 
-#include <uno/lbnames.h>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/lang/XComponent.hpp>

sc/workben/addin.cxx

@@ -30,7 +30,6 @@
 #include <svl/itemprop.hxx>
 #include <usr/proptypehlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <uno/lbnames.h>
 #include <osl/diagnose.h>
 
 #include <com/sun/star/util/date.hpp>

sd/source/ui/unoidl/facreg.cxx

@@ -22,7 +22,6 @@
 #include "sddll.hxx"
 
 #include <cppuhelper/factory.hxx>
-#include <uno/lbnames.h>
 #include <sfx2/sfxmodelfactory.hxx>
 #include "osl/diagnose.h"
 #include "sal/types.h"

shell/source/backends/desktopbe/desktopbackend.cxx

@@ -49,7 +49,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/current_context.hxx"
-#include "uno/lbnames.h"
 
 namespace {
 

shell/source/backends/gconfbe/gconfbackend.cxx

@@ -48,7 +48,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/current_context.hxx"
-#include "uno/lbnames.h"
 
 #include "gconfaccess.hxx"
 

shell/source/backends/kde4be/kde4backend.cxx

@@ -48,7 +48,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/current_context.hxx"
-#include "uno/lbnames.h"
 
 #include "kde4access.hxx"
 

shell/source/backends/kdebe/kdebackend.cxx

@@ -46,7 +46,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/current_context.hxx"
-#include "uno/lbnames.h"
 
 #include "shell/kde_headers.h"
 

stoc/source/bootstrap/services.cxx

@@ -24,7 +24,6 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "sal/types.h"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include <stdio.h>
 

stoc/source/corereflection/crefl.cxx

@@ -25,6 +25,7 @@
 #include <com/sun/star/reflection/XConstantTypeDescription.hpp>
 #include <com/sun/star/reflection/XTypeDescription.hpp>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <uno/lbnames.h>
 
 using namespace com::sun::star;
 using namespace com::sun::star::lang;

stoc/source/invocation_adapterfactory/iafactory.cxx

@@ -28,6 +28,7 @@
 #include <uno/dispatcher.h>
 #include <uno/data.h>
 #include <uno/any2.h>
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>

stoc/source/javaloader/javaloader.cxx

@@ -25,6 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <uno/environment.h>
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
 

stoc/source/javavm/javavm.cxx

@@ -70,7 +70,6 @@
 #include "sal/types.h"
 #include "uno/current_context.hxx"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 #include "jvmfwk/framework.h"
 #include "jni.h"
 

stoc/source/proxy_factory/proxyfac.cxx

@@ -25,6 +25,7 @@
 #include "rtl/ref.hxx"
 #include "uno/dispatcher.hxx"
 #include "uno/data.h"
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include "uno/environment.hxx"
 #include "typelib/typedescription.hxx"

stoc/source/security/access_controller.cxx

@@ -30,6 +30,7 @@
 #include <rtl/string.hxx>
 
 #include <uno/current_context.h>
+#include <uno/lbnames.h>
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase3.hxx>

stoc/source/stocservices/stocservices.cxx

@@ -24,7 +24,6 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "sal/types.h"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;

stoc/test/registry_tdprovider/testregistrytdprovider.cxx

@@ -50,7 +50,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include /*MSVC trouble: <cstdlib>*/ <stdlib.h>
 #include <iostream>

stoc/test/tdmanager/testtdmanager.cxx

@@ -48,7 +48,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include /*MSVC trouble: <cstdlib>*/ <stdlib.h>
 #include <iostream>

stoc/test/testproxyfac.cxx

@@ -22,6 +22,7 @@
 #include "osl/diagnose.h"
 #include "rtl/alloc.h"
 #include "uno/environment.hxx"
+#include <uno/lbnames.h>
 #include "cppuhelper/servicefactory.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase3.hxx"

svx/source/core/coreservices.cxx

@@ -23,8 +23,6 @@
 #include "sal/types.h"
 #include "osl/diagnose.h"
 #include "cppuhelper/factory.hxx"
-#include "uno/lbnames.h"
-
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;

svx/source/unodraw/unoctabl.cxx

@@ -229,7 +229,6 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con
 #include "sal/types.h"
 #include "osl/diagnose.h"
 #include "cppuhelper/factory.hxx"
-#include "uno/lbnames.h"
 #include <svx/sdr/primitive2d/primitiveFactory2d.hxx>
 #include "sidebar/PanelFactory.hxx"
 

sw/source/ui/uno/unofreg.cxx

@@ -20,7 +20,6 @@
 #include "SwXFilterOptions.hxx"
 #include "sal/types.h"
 #include <osl/diagnose.h>
-#include <uno/lbnames.h>
 #include <cppuhelper/factory.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 

testtools/source/bridgetest/bridgetest.cxx

@@ -26,6 +26,7 @@
 #include <sal/types.h>
 #include "typelib/typedescription.hxx"
 #include <uno/dispatcher.hxx>
+#include <uno/lbnames.h>
 #include "uno/mapping.hxx"
 #include <uno/data.h>
 #include "uno/environment.hxx"

testtools/source/bridgetest/constructors.cxx

@@ -45,7 +45,6 @@
 #include "test/testtools/bridgetest/TestPolyStruct.hpp"
 #include "test/testtools/bridgetest/TestPolyStruct2.hpp"
 #include "test/testtools/bridgetest/XMultiBase1.hpp"
-#include "uno/lbnames.h"
 
 namespace {
 

testtools/source/performance/ubtest.cxx

@@ -44,6 +44,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <uno/environment.hxx>
+#include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>

ucb/source/ucp/webdav/webdavservices.cxx

@@ -20,6 +20,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <uno/lbnames.h>
 #include "webdavprovider.hxx"
 
 using namespace com::sun::star;

ure/source/uretest/cppmain.cc

@@ -68,7 +68,6 @@
 #include "salhelper/simplereferenceobject.hxx"
 #include "uno/current_context.hxx"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include "test/types/CppTest.hpp"
 #include "test/types/JavaTest.hpp"

ure/source/uretest/cppserver.cc

@@ -34,7 +34,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/environment.h"
-#include "uno/lbnames.h"
 
 #include "test/types/Data.hpp"
 #include "test/types/XServer.hpp"