diff options
23 files changed, 114 insertions, 69 deletions
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx index 7b177c9e8ea4..4910adb57261 100644 --- a/cppuhelper/inc/cppuhelper/access_control.hxx +++ b/cppuhelper/inc/cppuhelper/access_control.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/security/XAccessController.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -37,7 +38,7 @@ namespace cppu /** Helper class retriving access controller singleton from component context. */ -class AccessControl +class CPPUHELPER_DLLPUBLIC AccessControl { ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController; diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx index 253d3fa53b40..cef4f2e8075c 100644 --- a/cppuhelper/inc/cppuhelper/bootstrap.hxx +++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx @@ -33,6 +33,7 @@ #include "com/sun/star/uno/Reference.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "cppuhelperdllapi.h" namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } @@ -48,7 +49,7 @@ namespace cppu @rBootstrapPath optional bootstrap path for initial components @return simple registry service instance */ -::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) SAL_THROW( () ); @@ -58,7 +59,7 @@ SAL_CALL createSimpleRegistry( @rBootstrapPath optional bootstrap path for initial components @return nested registry service instance */ -::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > SAL_CALL createNestedRegistry( const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) SAL_THROW( () ); @@ -68,7 +69,7 @@ SAL_CALL createNestedRegistry( @param xTDMgr manager instance @return true, if successfully registered */ -sal_Bool SAL_CALL installTypeDescriptionManager( +CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager( ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr ) SAL_THROW( () ); @@ -83,7 +84,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager( @param rBootstrapPath optional bootstrap path for initial components @return component context */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL bootstrap_InitialComponentContext( ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > const & xRegistry, ::rtl::OUString const & rBootstrapPath = ::rtl::OUString() ) @@ -109,7 +110,7 @@ bootstrap_InitialComponentContext( @return component context */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -133,7 +134,7 @@ defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Ex @param iniFile ini filename to get bootstrap variables @return component context */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_THROW( (::com::sun::star::uno::Exception) ); /** @@ -141,7 +142,7 @@ defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_TH * * @since UDK 3.2.0 */ -class BootstrapException +class CPPUHELPER_DLLPUBLIC BootstrapException { public: /** @@ -194,7 +195,7 @@ private: * * @since UDK 3.2.0 */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL bootstrap(); /** @@ -216,7 +217,7 @@ SAL_CALL bootstrap(); * * @since UDK 3.2.8 */ -::rtl::OUString +CPPUHELPER_DLLPUBLIC ::rtl::OUString SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri); } // end namespace cppu diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx index 121927b3320c..23515a8431ae 100644 --- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx @@ -32,6 +32,7 @@ #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/lang/XComponent.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -41,7 +42,7 @@ namespace cppu ::com::sun::star::lang::XComponent. @internal */ -class SAL_NO_VTABLE WeakComponentImplHelperBase +class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakComponentImplHelperBase : public ::cppu::OWeakObject , public ::com::sun::star::lang::XComponent { @@ -95,7 +96,7 @@ public: ::com::sun::star::lang::XComponent. @internal */ -class SAL_NO_VTABLE WeakAggComponentImplHelperBase +class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase : public ::cppu::OWeakAggObject , public ::com::sun::star::lang::XComponent { @@ -143,7 +144,7 @@ public: /** WeakComponentImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that, @@ -152,14 +153,14 @@ public: /** WeakComponentImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** WeakAggComponentImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that, @@ -168,7 +169,7 @@ public: /** WeakAggComponentImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx index 032afa0507bd..255a802e3c6e 100644 --- a/cppuhelper/inc/cppuhelper/component.hxx +++ b/cppuhelper/inc/cppuhelper/component.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> +#include "cppuhelperdllapi.h" namespace cppu { @@ -50,7 +51,7 @@ namespace cppu The life-cycle of the passed mutex reference has to be longer than objects of this class. @deprecated */ -class OComponentHelper +class CPPUHELPER_DLLPUBLIC OComponentHelper : public ::cppu::OWeakAggObject , public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::lang::XComponent diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx index 10ecc2a885c4..bcb02c705555 100644 --- a/cppuhelper/inc/cppuhelper/component_context.hxx +++ b/cppuhelper/inc/cppuhelper/component_context.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -85,7 +86,7 @@ struct ContextEntry_Init @param xDelegate delegation to further context, if value was not found @return new context object */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL createComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xDelegate = diff --git a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h new file mode 100644 index 000000000000..7e497f353e3b --- /dev/null +++ b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h @@ -0,0 +1,16 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_CPPUHELPERDLLAPI_H +#define INCLUDED_CPPUHELPERDLLAPI_H + +#include "sal/types.h" + +#if defined(CPPUHELPER_DLLIMPLEMENTATION) +#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_CPPUHELPERDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx index 5b07c05d9edc..9b6d30debc32 100644 --- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx +++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx @@ -30,6 +30,7 @@ #define _CPPUHELPER_EXC_HLP_HXX_ #include <com/sun/star/uno/Any.hxx> +#include "cppuhelperdllapi.h" namespace cppu { @@ -41,7 +42,7 @@ namespace cppu @param rExc exception to be thrown. */ -void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) +CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) SAL_THROW( (::com::sun::star::uno::Exception) ); /** Use this function to get the dynamic type of a caught C++-UNO exception; @@ -91,7 +92,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) development, because the whole OOo code base is compiled using the same C++ compiler (and linking against one runtime library). */ -::com::sun::star::uno::Any SAL_CALL getCaughtException(); +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL getCaughtException(); } diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index 9348fa0a52ba..26427d6b1b63 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include "cppuhelperdllapi.h" //################################################################################################## @@ -143,7 +144,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( @param rServiceNames supported services @param pModCount for future extension (library unloading concept). */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, @@ -160,7 +161,7 @@ SAL_CALL createSingleComponentFactory( @see createSingleComponentFactory */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFactory( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, @@ -190,7 +191,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA @see createOneInstanceFactory @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rImplementationName, @@ -213,7 +214,7 @@ createSingleFactory( @see createSingleFactory @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createFactoryProxy( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > & rFactory ) @@ -232,7 +233,7 @@ createFactoryProxy( @see createSingleFactory @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rComponentName, @@ -250,7 +251,8 @@ createOneInstanceFactory( XSingleServiceFactory and XComponent. @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +createSingleRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) @@ -268,7 +270,8 @@ createOneInstanceFactory( @see createSingleRegistryFactory @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +createOneInstanceRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rComponentName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx index a6ba29d7d3e0..09ae9e2f76d3 100644 --- a/cppuhelper/inc/cppuhelper/implbase.hxx +++ b/cppuhelper/inc/cppuhelper/implbase.hxx @@ -35,6 +35,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include "cppuhelperdllapi.h" /* This header should not be used anymore. @deprecated @@ -60,7 +61,7 @@ struct Type_Offset Not for public use. @internal */ -struct ClassDataBase +struct CPPUHELPER_DLLPUBLIC ClassDataBase { /** determines whether the class data has been statically initialized */ @@ -105,7 +106,7 @@ struct ClassDataBase Not for public use. @internal */ -struct ClassData : public ClassDataBase +struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase { /** type entries array */ @@ -149,7 +150,7 @@ struct ClassData : public ClassDataBase Not for public use. @internal */ -::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ); +CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () ); } // diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx index 267bdf6b04cc..190e400817c2 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx @@ -105,7 +105,7 @@ struct class_data /** ImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL ImplHelper_query( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_query( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that ) @@ -113,7 +113,7 @@ struct class_data /** ImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that ) @@ -121,27 +121,30 @@ struct class_data /** ImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +SAL_CALL ImplHelper_getTypes( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** ImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplInhHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +SAL_CALL ImplInhHelper_getTypes( class_data * cd, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > const & rAddTypes ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** ImplHelper @internal */ -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL ImplHelper_getImplementationId( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > +SAL_CALL ImplHelper_getImplementationId( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** WeakImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that, @@ -150,14 +153,16 @@ struct class_data /** WeakImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +SAL_CALL WeakImplHelper_getTypes( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** WeakAggImplHelper @internal */ -::com::sun::star::uno::Any SAL_CALL WeakAggImplHelper_queryAgg( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any +SAL_CALL WeakAggImplHelper_queryAgg( ::com::sun::star::uno::Type const & rType, class_data * cd, void * that, @@ -166,7 +171,8 @@ struct class_data /** WeakAggImplHelper @internal */ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +SAL_CALL WeakAggImplHelper_getTypes( class_data * cd ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx index 2561811fba1b..2c7a08e41ccc 100644 --- a/cppuhelper/inc/cppuhelper/implementationentry.hxx +++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx @@ -29,6 +29,7 @@ #define _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/factory.hxx> +#include "cppuhelperdllapi.h" namespace cppu { @@ -85,7 +86,7 @@ struct ImplementationEntry must be marked with a 0 entry in the create-function. @return sal_True, if all implementations could be registered, otherwise sal_False. */ -sal_Bool component_writeInfoHelper( +CPPUHELPER_DLLPUBLIC sal_Bool component_writeInfoHelper( void *pServiceManager, void *pRegistryKey , const struct ImplementationEntry entries[] ); /** Helper function for implementation of the component_getFactory()-function, @@ -104,7 +105,7 @@ sal_Bool component_writeInfoHelper( @return 0 if the helper failed to instantiate a factory, otherwise an acquired pointer to a factory. */ -void *component_getFactoryHelper( +CPPUHELPER_DLLPUBLIC void *component_getFactoryHelper( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey, diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index ae3c2adf1457..4f44d73f1c3e 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h @@ -40,6 +40,7 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_ #include "com/sun/star/lang/DisposedException.hpp" #endif +#include "cppuhelperdllapi.h" /** */ //for docpp namespace cppu @@ -65,7 +66,7 @@ class OInterfaceContainerHelper; @see OInterfaceContainerHelper */ -class OInterfaceIteratorHelper +class CPPUHELPER_DLLPUBLIC OInterfaceIteratorHelper { public: /** @@ -123,7 +124,7 @@ private: @see OInterfaceIteratorHelper */ -class OInterfaceContainerHelper +class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper { public: // these are here to force memory de/allocation to sal lib. @@ -515,7 +516,7 @@ struct hashType_Impl /** Specialized class for key type com::sun::star::uno::Type, without explicit usage of STL symbols. */ -class OMultiTypeInterfaceContainerHelper +class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper { public: // these are here to force memory de/allocation to sal lib. diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx index f23aec1dcb35..1438bc35012c 100644 --- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx +++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx @@ -42,6 +42,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "sal/types.h" +#include "cppuhelperdllapi.h" /// @HTML @@ -88,7 +89,7 @@ template< typename T > class PropertySetMixin; @since UDK 3.2.1 */ -class PropertySetMixinImpl: +class CPPUHELPER_DLLPUBLIC PropertySetMixinImpl: public com::sun::star::beans::XPropertySet, public com::sun::star::beans::XFastPropertySet, public com::sun::star::beans::XPropertyAccess diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 42aff103d053..00ff4d0b2f50 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -39,6 +39,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <memory> +#include "cppuhelperdllapi.h" namespace cppu @@ -52,7 +53,7 @@ namespace cppu /** This interface is used by the OPropertyHelper, to access the property description. */ -class IPropertyArrayHelper +class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper { public: // these are here to force memory de/allocation to sal lib. @@ -119,7 +120,7 @@ public: You can use this helper class to map a XPropertySet-Interface to a XFast- or a XMultiPropertySet interface. */ -class OPropertyArrayHelper : public IPropertyArrayHelper +class CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper { public: /** @@ -232,7 +233,7 @@ struct hashInt32_Impl /** Specialized class for key type sal_Int32, without explicit usage of STL symbols. */ -class OMultiTypeInterfaceContainerHelperInt32 +class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32 { public: // these are here to force memory de/allocation to sal lib. @@ -349,7 +350,8 @@ public: the connection point interfaces. But only listeners that listen to all property changes. */ -class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet, +class CPPUHELPER_DLLPUBLIC OPropertySetHelper : + public ::com::sun::star::beans::XMultiPropertySet, public ::com::sun::star::beans::XFastPropertySet, public ::com::sun::star::beans::XPropertySet { @@ -674,7 +676,7 @@ public: /** OPropertySetHelper plus XPropertySetOption */ -class OPropertySetHelper2 : public OPropertySetHelper, +class CPPUHELPER_DLLPUBLIC OPropertySetHelper2 : public OPropertySetHelper, public ::com::sun::star::beans::XPropertySetOption { public: diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx index 366b7dd35e06..290c12685bf3 100644 --- a/cppuhelper/inc/cppuhelper/servicefactory.hxx +++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -61,8 +62,8 @@ namespace cppu path. @deprecated */ -::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL -createRegistryServiceFactory( +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > +SAL_CALL createRegistryServiceFactory( const ::rtl::OUString & rWriteRegistryFile, const ::rtl::OUString & rReadRegistryFile, sal_Bool bReadOnly = sal_False, @@ -87,8 +88,8 @@ createRegistryServiceFactory( path. @deprecated */ -inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL -createRegistryServiceFactory( +inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > +SAL_CALL createRegistryServiceFactory( const ::rtl::OUString & rRegistryFile, sal_Bool bReadOnly = sal_False, const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) @@ -108,8 +109,8 @@ createRegistryServiceFactory( path. @deprecated */ -inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL -createServiceFactory( +inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > +SAL_CALL createServiceFactory( const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) SAL_THROW( (::com::sun::star::uno::Exception) ) { diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx index 21529bc8ba75..a951f9a38fb9 100644 --- a/cppuhelper/inc/cppuhelper/shlib.hxx +++ b/cppuhelper/inc/cppuhelper/shlib.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/registry/CannotRegisterImplementationException.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -60,7 +61,7 @@ namespace cppu factory instance (::com::sun::star::lang::XSingleComponentFactory or ::com::sun::star::lang::XSingleComponentFactory) */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL loadSharedLibComponentFactory( ::rtl::OUString const & rLibName, ::rtl::OUString const & rPath, ::rtl::OUString const & rImplName, @@ -85,7 +86,7 @@ SAL_CALL loadSharedLibComponentFactory( factory instance (::com::sun::star::lang::XSingleComponentFactory or ::com::sun::star::lang::XSingleComponentFactory) */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL loadSharedLibComponentFactory( ::rtl::OUString const & rLibName, ::rtl::OUString const & rPath, ::rtl::OUString const & rImplName, @@ -105,7 +106,7 @@ SAL_CALL loadSharedLibComponentFactory( factory instance (::com::sun::star::lang::XSingleComponentFactory or ::com::sun::star::lang::XSingleComponentFactory) */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL invokeStaticComponentFactory( oslGenericFunction pGetter, ::rtl::OUString const & rImplName, @@ -127,7 +128,7 @@ SAL_CALL invokeStaticComponentFactory( @param xMgr service manager to be provided to the component @param xKey registry key to be provided to the component */ -void +CPPUHELPER_DLLPUBLIC void SAL_CALL writeSharedLibComponentInfo( ::rtl::OUString const & rLibName, ::rtl::OUString const & rPath, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & xMgr, diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx index 73b8552a5a82..6879adf6f743 100644 --- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx +++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/reflection/XIdlClass.hpp> +#include "cppuhelperdllapi.h" namespace cppu { @@ -38,7 +39,7 @@ namespace cppu { @deprecated always returns </NULL> */ -::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( +CPPUHELPER_DLLPUBLIC ::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , const ::rtl::OUString & sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & rSuperClass, diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx index c434d54a7071..d9971854602f 100644 --- a/cppuhelper/inc/cppuhelper/typeprovider.hxx +++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx @@ -31,6 +31,7 @@ #include <rtl/alloc.h> #include <rtl/uuid.h> #include <com/sun/star/uno/Sequence.hxx> +#include "cppuhelperdllapi.h" namespace cppu @@ -39,7 +40,7 @@ namespace cppu /** Helper class to implement ::com::sun::star::lang::XTypeProvider. Construct a static object of this class with your UNO object's supported types. */ -class OTypeCollection +class CPPUHELPER_DLLPUBLIC OTypeCollection { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes; @@ -188,7 +189,7 @@ public: /** Helper class to implement ::com::sun::star::lang::XTypeProvider. Construct a static object of this class for your UNO object's implementation id. */ -class OImplementationId +class CPPUHELPER_DLLPUBLIC OImplementationId { /** @internal */ mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq; diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index c0d70dee8e9b..38ec096d7347 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/cppuhelper/inc/cppuhelper/unourl.hxx @@ -30,6 +30,7 @@ #define INCLUDED_CPPUHELPER_UNOURL_HXX #include <memory> +#include "cppuhelperdllapi.h" namespace rtl { class OUString; } @@ -42,7 +43,7 @@ namespace cppu { For example, some functions take a string representing a connection or protocol descriptor as input, and can use this class to parse the string. */ -class UnoUrlDescriptor +class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor { public: /** @internal @@ -139,7 +140,7 @@ private: invalid UTF-16 entities in the resulting output (e.g., a high surrogate not followed by a low surrogate) are not detected. */ -class UnoUrl +class CPPUHELPER_DLLPUBLIC UnoUrl { public: /** Construct a UNO URL from a string representation. diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index 14236d992310..0775a2570bd5 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.hxx @@ -33,6 +33,7 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/uno/XWeak.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -49,7 +50,7 @@ class OWeakConnectionPoint; @derive Inherit from this class and delegate acquire()/ release() calls. */ -class OWeakObject : public ::com::sun::star::uno::XWeak +class CPPUHELPER_DLLPUBLIC OWeakObject : public ::com::sun::star::uno::XWeak { /** @internal */ friend class OWeakConnectionPoint; diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx index adc3b7987d04..e36367b8bec3 100644 --- a/cppuhelper/inc/cppuhelper/weakagg.hxx +++ b/cppuhelper/inc/cppuhelper/weakagg.hxx @@ -30,6 +30,7 @@ #include <cppuhelper/weak.hxx> #include <com/sun/star/uno/XAggregation.hpp> +#include "cppuhelperdllapi.h" namespace cppu @@ -45,7 +46,7 @@ namespace cppu Inherit from this class and delegate acquire()/ release() calls. Re-implement XAggregation::queryInterface(). */ -class OWeakAggObject +class CPPUHELPER_DLLPUBLIC OWeakAggObject : public ::cppu::OWeakObject , public ::com::sun::star::uno::XAggregation { diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx index f138a8aeaf10..12a81ee03a4f 100644 --- a/cppuhelper/inc/cppuhelper/weakref.hxx +++ b/cppuhelper/inc/cppuhelper/weakref.hxx @@ -29,6 +29,7 @@ #define _CPPUHELPER_WEAKREF_HXX_ #include <com/sun/star/uno/XInterface.hpp> +#include "cppuhelperdllapi.h" namespace com @@ -46,7 +47,7 @@ class OWeakRefListener; /** The WeakReferenceHelper holds a weak reference to an object. This object must implement the ::com::sun::star::uno::XWeak interface. The implementation is thread safe. */ -class WeakReferenceHelper +class CPPUHELPER_DLLPUBLIC WeakReferenceHelper { public: /** Default ctor. Creates an empty weak reference. diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index ea97a17edd72..d0dea93cf664 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -378,7 +378,7 @@ void addFactories( } // namespace -Reference< lang::XMultiComponentFactory > bootstrapInitialSF( +SAL_DLLPUBLIC_EXPORT Reference< lang::XMultiComponentFactory > bootstrapInitialSF( OUString const & rBootstrapPath ) SAL_THROW( (Exception) ) { |