diff options
78 files changed, 37 insertions, 61 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index ba9a847bc48c..e6ffc49b3f5c 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/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 { diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index 0aacd14e3523..99d0a985802e 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/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> diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index 2200e322871a..240b5f85ed51 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/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" diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 393202c95ba6..407872948664 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/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 { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 0577ad974338..6657a05632f1 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/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> diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 6a0258a87651..7f8c675a1ae1 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/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 { diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index 7c97153264ef..aaae581b60bf 100644 --- a/cli_ure/source/native/native_share.h +++ b/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> diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index f1a9df42f28d..a5ef10115da8 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/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; diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index e485b61c7ad3..81cfc3c09f09 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/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; diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 227a9ab0abb0..340ef211a485 100644 --- a/cppu/source/threadpool/current.cxx +++ b/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" diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 59da613a0623..0d56124a4476 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/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" diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index bc954c67ba73..7a8f85961014 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/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" 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); diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index f84336d8e973..9591c9d530a1 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/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 { diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 93af8ab664e4..b4f78870752d 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/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 { diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 372d0f018850..e071c634b833 100644 --- a/forms/source/misc/services.cxx +++ b/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> 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; diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 0fa2558c87f1..645d6cd1d1ad 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/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" diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 0ba0b5fdea6c..968acacdb46c 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/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> diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx index 69be97943dc7..ec984a9044d0 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx +++ b/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> diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index 06db94287907..4ca025449e48 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/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> diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index 89ac20e8936d..1ea380be04bd 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/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> diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index fb9d6fbed79b..dce8c473dc47 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -25,7 +25,6 @@ #include <tools/solar.h> -#include <uno/lbnames.h> #include <cppuhelper/implbase1.hxx> diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index d362a90a6499..bf00ab064f5b 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/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> diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index db98fb4b0a61..806d09c6879b 100644 --- a/linguistic/inc/iprcache.hxx +++ b/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> diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index baf1db4bca5e..dee9df3e0e50 100644 --- a/linguistic/source/dicimp.hxx +++ b/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> diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index daf5b18d78ab..ddfafe60188d 100644 --- a/linguistic/source/dlistimp.hxx +++ b/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> diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 90b1630a62ba..390bd4483720 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/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> diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 694d6a714f87..7dbf3318f37d 100644 --- a/linguistic/source/lngopt.cxx +++ b/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> diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 4d68370331ea..4e3df8ed58dd 100644 --- a/linguistic/source/lngopt.hxx +++ b/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> diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 2ad941674515..cc926b62bd7b 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/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> diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index b00f08427fdc..1c95e8d43f3a 100644 --- a/linguistic/source/spelldsp.hxx +++ b/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> diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index f49b953963d8..1f9e8973df9d 100644 --- a/linguistic/source/thesdsp.hxx +++ b/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> diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index c6f4da44c0d2..50a6bb87a32f 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/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> diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index f53cb46ba435..2ee5745b87be 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/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> diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 1d4d38a1d338..e1ac9979d1bd 100644 --- a/sc/workben/addin.cxx +++ b/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> diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 9b533eafb6cf..b77e26de2b14 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/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" diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 3e8e8c176b84..8233bffa4488 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/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 { diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 97441d9e8303..47d6cdbe2e11 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/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" diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 672c41e059ed..bf126832d414 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/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" diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 607e1b5f12a2..8089632a4fa3 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/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" diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index 7e81e13692ca..126558ebdb1f 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/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> diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index f5919ca94c13..866a4f7786e9 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/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; diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 9f494761c93d..93f2b68074c2 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/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> diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 83887e917395..164006f45b54 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/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" diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index a102b86f1a26..b1cbf953b77c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/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" diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 5ac0864ce50e..d4cb32738611 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/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" diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index ee218a8e5eb8..30f4efb361f5 100644 --- a/stoc/source/security/access_controller.cxx +++ b/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> diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx index 44fcc4e3255a..fc4d765b7e1f 100644 --- a/stoc/source/stocservices/stocservices.cxx +++ b/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; diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 8038d6173be8..3b94260e9c7a 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/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> diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index c4e19a104738..59fa9c2e4c10 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/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> diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 769e93ee8c12..d564ba63e832 100644 --- a/stoc/test/testproxyfac.cxx +++ b/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" diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 37bc2e3db5f2..4258864056e9 100644 --- a/svx/source/core/coreservices.cxx +++ b/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; diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 37c34c5e554e..6963cf9b52bc 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/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" diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index 995c263f8bec..4c36a3caf4a8 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/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> diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index fc03a853887a..fbc8791eed07 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/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" diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index ac011bf6db13..4bf77b909fc0 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/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 { diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 00c2a3502f86..acdeb8255200 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/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> diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 6bf9f78b62fc..2aaaea128ef4 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/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; diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 2759356fe211..1e63cd33f889 100644 --- a/ure/source/uretest/cppmain.cc +++ b/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" diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index cee80d39872b..450c04d12bb2 100644 --- a/ure/source/uretest/cppserver.cc +++ b/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" diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index 5bd200614f78..04dba6ffbb95 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -32,7 +32,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" #include "uno/environment.h" -#include "uno/lbnames.h" #include "test/types/TestException.hpp" #include "test/types/XTest.hpp" diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 229399a205d2..141ef860d743 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <cppuhelper/factory.hxx> -#include <uno/lbnames.h> #include <xmloff/xmlreg.hxx> using namespace com::sun::star; |