extensions/source/resource/resourceservices.cxx | 12 ++++++++---- filter/source/svg/svgfilter.cxx | 9 ++++++++- 2 files changed, 16 insertions(+), 5 deletions(-)
New commits: commit 09046cb6c040e836c0041c18b617559cd0e21df7 Author: Matúš Kukan <[email protected]> Date: Sun Oct 2 00:16:18 2011 +0200 do not use COMPHELPER_SERVICEDECL_EXPORTS macro diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx index 0a08bb5..9f4358d 100644 --- a/extensions/source/resource/resourceservices.cxx +++ b/extensions/source/resource/resourceservices.cxx @@ -50,9 +50,13 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl( "com.sun.star.comp.resource.OpenOfficeResourceLoader", "com.sun.star.resource.OfficeResourceLoader"); -COMPHELPER_SERVICEDECL_EXPORTS2( - ResourceIndexAccessDecl, - OpenOfficeResourceLoaderDecl -); +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, + ResourceIndexAccessDecl, OpenOfficeResourceLoaderDecl ); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 236e933..42f48a2 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -334,6 +334,13 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.document.ExtendedTypeDetection" ); // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, + pRegistryKey, svgFilter ); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
