From 565acfef761e37a0172154aae0bdace1ce3c6666 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 12:04:10 +0300 Subject: Use prefix Change-Id: Ife93e37f8b24f3ce96b55c5a221f0f929b789f60 --- shell/source/backends/gconfbe/gconfbackend.cxx | 2 +- shell/source/backends/gconfbe/gconfbe1.component | 2 +- shell/source/backends/kde4be/kde4backend.cxx | 2 +- shell/source/backends/kde4be/kde4be1.component | 2 +- shell/source/backends/kdebe/kdebackend.cxx | 2 +- shell/source/backends/kdebe/kdebe1.component | 2 +- shell/source/backends/macbe/macbe1.component | 2 +- shell/source/backends/macbe/macbecdef.cxx | 2 +- shell/source/backends/wininetbe/wininetbe1.component | 2 +- shell/source/backends/wininetbe/wininetbecdef.cxx | 2 +- shell/source/cmdmail/cmdmail.component | 2 +- shell/source/cmdmail/cmdmailentry.cxx | 2 +- shell/source/unix/exec/shellexecentry.cxx | 2 +- shell/source/unix/exec/syssh.component | 2 +- shell/source/win32/SysShentry.cxx | 2 +- shell/source/win32/simplemail/smplmail.component | 2 +- shell/source/win32/simplemail/smplmailentry.cxx | 2 +- shell/source/win32/syssh.component | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 82ea9fe0721b..263fa7de7454 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -217,7 +217,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL gconfbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component index 7638e05b544a..b48806c827fc 100644 --- a/shell/source/backends/gconfbe/gconfbe1.component +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 1c87c48a02ec..314cd5aa7144 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kde4be1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component index 8ea7ae121088..9bceccc62ca6 100644 --- a/shell/source/backends/kde4be/kde4be1.component +++ b/shell/source/backends/kde4be/kde4be1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 4faf91106560..ad82efcc2c4f 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kdebe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component index 393fbc80d538..7e70f656f254 100644 --- a/shell/source/backends/kdebe/kdebe1.component +++ b/shell/source/backends/kdebe/kdebe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component index 10bac2e2b6a0..c76036126733 100644 --- a/shell/source/backends/macbe/macbe1.component +++ b/shell/source/backends/macbe/macbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index a52d7acb6ee9..cd1f702aec98 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component index d8930280fb2a..a6655ce680f5 100644 --- a/shell/source/backends/wininetbe/wininetbe1.component +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index ca82c1b8c088..8b47da586e1f 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component index 7e56741d16c1..7b2761d6cfb1 100644 --- a/shell/source/cmdmail/cmdmail.component +++ b/shell/source/cmdmail/cmdmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index b0e45feaafb5..3dbb894bd033 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -62,7 +62,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 684acfe5f036..997de2132d30 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -60,7 +60,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component index 030240dff3bf..d7e76945c0d3 100644 --- a/shell/source/unix/exec/syssh.component +++ b/shell/source/unix/exec/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index e5a61bb25d04..93a4533a9f15 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component index 59246c6d1551..c0a2bcb84e76 100644 --- a/shell/source/win32/simplemail/smplmail.component +++ b/shell/source/win32/simplemail/smplmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index df3774a79345..9b6228bea516 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component index 1e783f5221ae..78da5c2cae17 100644 --- a/shell/source/win32/syssh.component +++ b/shell/source/win32/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> - -- cgit