Use prefix

Change-Id: I80de62d3afd461bc51a33d427794c86c4a6bc32c

6 files changed, 10 insertions, 7 deletions

diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component
index 8a90fd22c5dc..a0111a35f0f6 100644
--- a/sdext/source/minimizer/minimizer.component
+++ b/sdext/source/minimizer/minimizer.component
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <component xmlns="http://openoffice.org/2010/uno-components"
-        loader="com.sun.star.loader.SharedLibrary">
+        loader="com.sun.star.loader.SharedLibrary"
+	prefix="pptminimizer">
     <implementation name="com.sun.star.comp.PPPOptimizerImp">
         <service name="com.sun.star.comp.PPPOptimizer"/>
     </implementation>
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 515baf3648f9..5de73c7d0553 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL pptminimizer_component_getFactory(
         const sal_Char * pImplName, void * pServiceManager,
         SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
     {
diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component
index 1392302f358a..548af84cb4f4 100644
--- a/sdext/source/pdfimport/pdfimport.component
+++ b/sdext/source/pdfimport/pdfimport.component
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <component xmlns="http://openoffice.org/2010/uno-components"
-        loader="com.sun.star.loader.SharedLibrary">
+        loader="com.sun.star.loader.SharedLibrary"
+	prefix="pdfimport">
     <implementation name="com.sun.star.comp.documents.HybridPDFImport">
         <service name="com.sun.star.document.ImportFilter"/>
     </implementation>
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index 7e4da4b2132c..1bafab0a9ae7 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -119,7 +119,7 @@ namespace
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory(
     const sal_Char* pImplementationName,
     SAL_UNUSED_PARAMETER void* /*pServiceManager*/,
     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ )
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 8032fb03c27a..4a5180d310a6 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -100,12 +100,12 @@ static struct ImplementationEntry gServiceEntries[] =
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL presenter_component_canUnload( TimeValue *pTime )
     {
         return g_moduleCount.canUnload( &g_moduleCount , pTime );
     }
 
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory(
         const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
         return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component
index 4dfd7cc403e4..a61807b2329a 100644
--- a/sdext/source/presenter/presenter.component
+++ b/sdext/source/presenter/presenter.component
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <component xmlns="http://openoffice.org/2010/uno-components"
-        loader="com.sun.star.loader.SharedLibrary">
+        loader="com.sun.star.loader.SharedLibrary"
+	prefix="presenter">
     <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob">
         <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
     </implementation>