From 4b6111cf6a6bcc8e3e7064871fea687aa7798299 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 2 Oct 2012 10:46:53 +0300
Subject: Use prefix

Change-Id: Ifbe8796e3af2e7544cf7d47bacb0632d36202433
---
 fpicker/source/aqua/FPentry.mm              | 2 +-
 fpicker/source/aqua/fps_aqua.component      | 2 +-
 fpicker/source/generic/fpicker.component    | 2 +-
 fpicker/source/generic/fpicker.cxx          | 2 +-
 fpicker/source/office/fps_office.component  | 2 +-
 fpicker/source/office/fps_office.cxx        | 2 +-
 fpicker/source/win32/filepicker/FPentry.cxx | 2 +-
 fpicker/source/win32/fps.component          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index f3fee99419ac..d51486838819 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -53,7 +53,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
     void* pRet = 0;
diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component
index f0e2f47b8ae3..7ad2926b62df 100644
--- a/fpicker/source/aqua/fps_aqua.component
+++ b/fpicker/source/aqua/fps_aqua.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_aqua"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker">
     <service name="com.sun.star.ui.dialogs.AquaFilePicker"/>
diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component
index b87a2c8be085..7aee017dc99a 100644
--- a/fpicker/source/generic/fpicker.component
+++ b/fpicker/source/generic/fpicker.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fpicker"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.fpicker.FilePicker">
     <service name="com.sun.star.ui.dialogs.FilePicker"/>
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 1222025a3786..4c4dd9a57847 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -225,7 +225,7 @@ static cppu::ImplementationEntry g_entries[] =
  */
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fpicker_component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
     return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
index ebce7f2e13b5..335a63a6f7a9 100644
--- a/fpicker/source/office/fps_office.component
+++ b/fpicker/source/office/fps_office.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_office"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.svtools.OfficeFilePicker">
     <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 77a9e207e047..e38d25f06322 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -44,7 +44,7 @@ static cppu::ImplementationEntry g_entries[] =
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory(
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
     return cppu::component_getFactoryHelper (
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 532edcfbf086..f09938ddec51 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -89,7 +89,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
 {
     void* pRet = 0;
diff --git a/fpicker/source/win32/fps.component b/fpicker/source/win32/fps.component
index 1a2e7f2ad9a2..1dc9d4f3abf9 100644
--- a/fpicker/source/win32/fps.component
+++ b/fpicker/source/win32/fps.component
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_win32"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.ui.dialogs.Win32FilePicker">
     <service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
-- 
cgit