[Libreoffice-commits] .: 2 commits - sdext/source shell/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 02:07:30 PDT 2012
sdext/source/minimizer/minimizer.component | 3 ++-
sdext/source/minimizer/pppoptimizeruno.cxx | 2 +-
sdext/source/pdfimport/pdfimport.component | 3 ++-
sdext/source/pdfimport/services.cxx | 2 +-
sdext/source/presenter/PresenterComponent.cxx | 4 ++--
sdext/source/presenter/presenter.component | 3 ++-
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 +-
24 files changed, 28 insertions(+), 25 deletions(-)
New commits:
commit 565acfef761e37a0172154aae0bdace1ce3c6666
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 12:04:10 2012 +0300
Use prefix
Change-Id: Ife93e37f8b24f3ce96b55c5a221f0f929b789f60
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 82ea9fe..263fa7d 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 7638e05..b48806c 100644
--- a/shell/source/backends/gconfbe/gconfbe1.component
+++ b/shell/source/backends/gconfbe/gconfbe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="gconfbe1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.GconfBackend">
<service name="com.sun.star.configuration.backend.GconfBackend"/>
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 1c87c48..314cd5a 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 8ea7ae1..9bceccc 100644
--- a/shell/source/backends/kde4be/kde4be1.component
+++ b/shell/source/backends/kde4be/kde4be1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="kde4be1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.KDE4Backend">
<service name="com.sun.star.configuration.backend.KDE4Backend"/>
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 4faf911..ad82efc 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 393fbc8..7e70f65 100644
--- a/shell/source/backends/kdebe/kdebe1.component
+++ b/shell/source/backends/kdebe/kdebe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="kdebe1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.KDEBackend">
<service name="com.sun.star.configuration.backend.KDEBackend"/>
diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component
index 10bac2e..c760361 100644
--- a/shell/source/backends/macbe/macbe1.component
+++ b/shell/source/backends/macbe/macbe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="macbe1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend">
<service name="com.sun.star.configuration.backend.MacOSXBackend"/>
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index a52d7ac..cd1f702 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 d893028..a6655ce 100644
--- a/shell/source/backends/wininetbe/wininetbe1.component
+++ b/shell/source/backends/wininetbe/wininetbe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="wininetbe1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.WinInetBackend">
<service name="com.sun.star.configuration.backend.WinInetBackend"/>
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index ca82c1b..8b47da5 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 7e56741..7b2761d 100644
--- a/shell/source/cmdmail/cmdmail.component
+++ b/shell/source/cmdmail/cmdmail.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="cmdmail"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.system.SimpleCommandMail">
<service name="com.sun.star.system.SimpleCommandMail"/>
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index b0e45fe..3dbb894 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 684acfe..997de21 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 030240d..d7e7694 100644
--- a/shell/source/unix/exec/syssh.component
+++ b/shell/source/unix/exec/syssh.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.system.SystemShellExecute">
<service name="com.sun.star.system.SystemShellExecute"/>
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index e5a61bb..93a4533 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 59246c6..c0a2bcb 100644
--- a/shell/source/win32/simplemail/smplmail.component
+++ b/shell/source/win32/simplemail/smplmail.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="smplmail"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.system.SimpleSystemMail">
<service name="com.sun.star.system.SimpleSystemMail"/>
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index df3774a..9b6228b 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 1e783f5..78da5c2 100644
--- a/shell/source/win32/syssh.component
+++ b/shell/source/win32/syssh.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="syssh"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.system.SystemShellExecute">
<service name="com.sun.star.system.SystemShellExecute"/>
commit f4901ad51b62db9faa2328f07cb6cf4b03a8ff1a
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Oct 2 11:53:55 2012 +0300
Use prefix
Change-Id: I80de62d3afd461bc51a33d427794c86c4a6bc32c
diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component
index 8a90fd2..a0111a3 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 515baf3..5de73c7 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 1392302..548af84 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 7e4da4b..1bafab0 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 8032fb0..4a5180d 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 4dfd7cc..a61807b 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>
More information about the Libreoffice-commits
mailing list