diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-03-16 15:50:44 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-03-16 17:02:23 +0100 |
| commit | 80fe015a86c90db2bcbfcd382eb24c8b7069fa3a (patch) | |
| tree | bfe90c47d76ac21ee493459f0fc4151da804fa83 /slideshow | |
| parent | d32cf8d820be839c7303e3c5962c17f64cac2812 (diff) | |
Add COMPHELPER_SERVICEDECL_EXPORTS* back in, after libmerge changes
Did I mention I hate boilerplate copied all over the place? ;)
Diffstat (limited to 'slideshow')
4 files changed, 4 insertions, 36 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index f3bfab40f664..8d2ab4e8a21d 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -1124,14 +1124,6 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.presentation.TransitionFactory" ); // The C shared lib entry points -extern "C" -{ -SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName, - ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, - ::com::sun::star::registry::XRegistryKey* pRegistryKey ) -{ - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl ); -} -} +COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, OGLTransitionFactoryDecl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx index 1f301e60fd99..b82f41cae656 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx @@ -1470,14 +1470,6 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.presentation.TransitionFactory" ); // The C shared lib entry points -extern "C" -{ -SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName, - ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, - ::com::sun::star::registry::XRegistryKey* pRegistryKey ) -{ - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl ); -} -} +COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, OGLTransitionFactoryDecl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx index 7aa72062d662..091dc2042b69 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx @@ -1442,14 +1442,6 @@ const sdecl::ServiceDecl OGLTransitionFactoryDecl( "com.sun.star.presentation.TransitionFactory" ); // The C shared lib entry points -extern "C" -{ -SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName, - ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, - ::com::sun::star::registry::XRegistryKey* pRegistryKey ) -{ - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl ); -} -} +COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, OGLTransitionFactoryDecl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 864c412cbf9b..2ff3e8cf556c 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2456,14 +2456,6 @@ const sdecl::ServiceDecl slideShowDecl( "com.sun.star.presentation.SlideShow" ); // The C shared lib entry points -extern "C" -{ -SAL_DLLPUBLIC_EXPORT void* SAL_CALL slideshow_component_getFactory( sal_Char const* pImplName, - ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, - ::com::sun::star::registry::XRegistryKey* pRegistryKey ) -{ - return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, slideShowDecl ); -} -} +COMPHELPER_SERVICEDECL_EXPORTS1(slideshow, slideShowDecl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |