[Libreoffice-commits] .: basic/source basic/util linguistic/source uui/source uui/util xmlscript/source xmlscript/util xmlsecurity/source xmlsecurity/util

Matus Kukan mkukan at kemper.freedesktop.org
Thu Aug 18 05:16:23 PDT 2011 

 basic/source/uno/sbservices.cxx                   |    2 +-
 basic/util/sb.component                           |    2 +-
 linguistic/source/lng.component                   |    2 +-
 linguistic/source/lngreg.cxx                      |    2 +-
 uui/source/services.cxx                           |    2 +-
 uui/util/uui.component                            |    2 +-
 xmlscript/source/misc/unoservices.cxx             |    2 +-
 xmlscript/util/xcr.component                      |    2 +-
 xmlsecurity/source/component/registerservices.cxx |    2 +-
 xmlsecurity/source/framework/xsec_framework.cxx   |    2 +-
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx         |    2 +-
 xmlsecurity/util/xmlsecurity.component            |    2 +-
 xmlsecurity/util/xsec_fw.component                |    2 +-
 xmlsecurity/util/xsec_xmlsec.component            |    2 +-
 xmlsecurity/util/xsec_xmlsec.windows.component    |    2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 15f482b1e9aff47a366a1cb1666fb4aabea49912
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Aug 18 01:03:12 2011 +0200

    Add prefixes for some component_getFactory functions

diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index f4453d4..d0bbd06 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -60,7 +60,7 @@ namespace basic
 } // namespace basic
 //........................................................................
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sb_component_getFactory(
     const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
 {
     ::basic::initializeModule();
diff --git a/basic/util/sb.component b/basic/util/sb.component
index 4687bd1..7f23c11 100755
--- a/basic/util/sb.component
+++ b/basic/util/sb.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sb"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
     <service name="com.sun.star.script.DialogLibraryContainer"/>
diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component
index f4f3ca6..1b31003 100755
--- a/linguistic/source/lng.component
+++ b/linguistic/source/lng.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="lng"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.lingu2.ConvDicList">
     <service name="com.sun.star.linguistic2.ConversionDictionaryList"/>
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index 34048e5..997efef 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -78,7 +78,7 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL lng_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet =
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 2ef3127..a25af91 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::registry;
 using ::rtl::OUString;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName,
                         void * pServiceManager,
                         void *)
 {
diff --git a/uui/util/uui.component b/uui/util/uui.component
index 0a15ad6..c78d6af 100755
--- a/uui/util/uui.component
+++ b/uui/util/uui.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="uui"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation
       name="com.sun.star.comp.uui.PasswordContainerInteractionHandler">
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index d795ee6..d6f03b7 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -106,7 +106,7 @@ namespace xmlscript
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL xcr_component_getFactory(
         const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
         return ::cppu::component_getFactoryHelper(
diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component
index 5ffe7f8..b85d5d7 100755
--- a/xmlscript/util/xcr.component
+++ b/xmlscript/util/xcr.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xcr"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
     <service name="com.sun.star.xml.input.SaxDocumentHandler"/>
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 69d06d1..b3bc997 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void* pRet = 0;
     uno::Reference< XInterface > xFactory;
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index a57ce0d..4c2be36 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 502eac8..d7d9199 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -100,7 +100,7 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* );
 extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
 #endif
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
 {
     void* pRet = 0;
     Reference< XInterface > xFactory ;
diff --git a/xmlsecurity/util/xmlsecurity.component b/xmlsecurity/util/xmlsecurity.component
index b0759e9..335eeef 100644
--- a/xmlsecurity/util/xmlsecurity.component
+++ b/xmlsecurity/util/xmlsecurity.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlsecurity"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.security.CertificateContainer">
     <service name="com.sun.star.security.CertificateContainer"/>
diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component
index eb9e396..27a4879 100644
--- a/xmlsecurity/util/xsec_fw.component
+++ b/xmlsecurity/util/xsec_fw.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_fw"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.xml.security.framework.DecryptorImpl">
     <service name="com.sun.star.xml.crypto.sax.Decryptor"/>
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
index df4c2a7..01d69bb 100644
--- a/xmlsecurity/util/xsec_xmlsec.component
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.security.SerialNumberAdapter">
     <service name="com.sun.star.security.SerialNumberAdapter"/>
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
index 7b4ef87..cb877c2 100644
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.security.SerialNumberAdapter">
     <service name="com.sun.star.security.SerialNumberAdapter"/>

More information about the Libreoffice-commits mailing list