diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-28 14:37:59 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-28 14:37:59 +0200 |
commit | 7e5b4be4cf6f699ec8fcfa8fb9cb35d5782b2f41 (patch) | |
tree | 48acfeb72d0775ae5729a8e4c7f94d78be3df589 /sd | |
parent | 58707d613f0fdd7e80cde7502195d7d0112fa3a4 (diff) |
add prefixes for component_getFactory
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/unoidl/detreg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 2 | ||||
-rw-r--r-- | sd/util/sd.component | 2 | ||||
-rw-r--r-- | sd/util/sdd.component | 2 | ||||
-rw-r--r-- | sd/util/sdfilt.component | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 69c231abaeb5..6cf83a76c072 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2236,11 +2236,7 @@ extern "C" { #endif -// ------------------------ -// - component_getFactory - -// ------------------------ - -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdfilt_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx index 92fb91fe1d17..4f0c168e861e 100644 --- a/sd/source/ui/unoidl/detreg.cxx +++ b/sd/source/ui/unoidl/detreg.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdd_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* ) diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 563c374286c9..f086164ef393 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -297,7 +297,7 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/sd/util/sd.component b/sd/util/sd.component index 0d0011b4839e..23102584e8e1 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="sd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.DrawingDocument"> <service name="com.sun.star.drawing.DrawingDocument"/> diff --git a/sd/util/sdd.component b/sd/util/sdd.component index 51160d0f04fe..0bf634197c52 100644 --- a/sd/util/sdd.component +++ b/sd/util/sdd.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="sdd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.draw.FormatDetector"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component index 397d31cf648f..17f09f45c460 100644 --- a/sd/util/sdfilt.component +++ b/sd/util/sdfilt.component @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="sdfilt" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"> <service name="com.sun.star.comp.ooxpptx"/> |