[Libreoffice-commits] .: starmath/source starmath/util sw/source sw/util
Matus Kukan
mkukan at kemper.freedesktop.org
Fri Jul 15 07:42:45 PDT 2011
starmath/source/detreg.cxx | 2 +-
starmath/source/register.cxx | 2 +-
starmath/util/sm.component | 2 +-
starmath/util/smd.component | 2 +-
sw/source/filter/ww8/docxexportfilter.cxx | 2 +-
sw/source/ui/uno/detreg.cxx | 2 +-
sw/source/ui/uno/unofreg.cxx | 2 +-
sw/source/ui/vba/service.cxx | 15 ++++++---------
sw/util/msword.component | 3 ++-
sw/util/sw.component | 3 ++-
sw/util/swd.component | 2 +-
sw/util/vbaswobj.component | 2 +-
12 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 433833e8a77dad2dcc272c867c858beacea2ebc6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Jul 15 16:40:20 2011 +0200
Add prefixes for component_getFactory methods
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index b6f7733..d7f6f64 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL smd_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index cb8d546..7d44e2b 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -112,7 +112,7 @@ extern Reference< XInterface > SAL_CALL
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
index 8047662..407f067 100644
--- a/starmath/util/sm.component
+++ b/starmath/util/sm.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sm"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Math.FormulaDocument">
<service name="com.sun.star.formula.FormulaProperties"/>
diff --git a/starmath/util/smd.component b/starmath/util/smd.component
index 9f56686..70adf5a 100644
--- a/starmath/util/smd.component
+++ b/starmath/util/smd.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="smd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.math.FormatDetector">
<service name="com.sun.star.frame.ExtendedTypeDetection"/>
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 62daec9..38faf1c 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -143,7 +143,7 @@ extern "C"
{ 0, 0, 0, 0, 0, 0 }
};
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries );
}
diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx
index 0b64aa5..3e47120 100644
--- a/sw/source/ui/uno/detreg.cxx
+++ b/sw/source/ui/uno/detreg.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL swd_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index a9d6d96..38f3b5b 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -160,7 +160,7 @@ static ::cppu::ImplementationEntry const entries[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
void * pRegistryKey )
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 7568106..7bdc724 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -63,18 +63,15 @@ namespace vbaeventshelper
extern sdecl::ServiceDecl const serviceDecl;
}
-extern "C"
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory(
+ const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
+ registry::XRegistryKey * pRegistryKey )
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
- const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
- registry::XRegistryKey * pRegistryKey )
- {
- OSL_TRACE("In component_getFactory for %s", pImplName );
- void* pRet = component_getFactoryHelper(
- pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
+ void* pRet = component_getFactoryHelper(pImplName, pServiceManager,
+ pRegistryKey, globals::serviceDecl, document::serviceDecl,
+ wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
OSL_TRACE("Ret is 0x%x", pRet);
return pRet;
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/util/msword.component b/sw/util/msword.component
index 54e638e..5457603 100644
--- a/sw/util/msword.component
+++ b/sw/util/msword.component
@@ -25,7 +25,8 @@
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
-<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="msword"
+ xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.RtfExport">
<service name="com.sun.star.comp.Writer.RtfExport"/>
</implementation>
diff --git a/sw/util/sw.component b/sw/util/sw.component
index 7f73777..643576c 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -25,7 +25,8 @@
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
-<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sw"
+ xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SwXAutoTextContainer">
<service name="com.sun.star.text.AutoTextContainer"/>
</implementation>
diff --git a/sw/util/swd.component b/sw/util/swd.component
index c89c007..74182f7 100644
--- a/sw/util/swd.component
+++ b/sw/util/swd.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="swd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.writer.FormatDetector">
<service name="com.sun.star.frame.ExtendedTypeDetection"/>
diff --git a/sw/util/vbaswobj.component b/sw/util/vbaswobj.component
index e6c6fe4..b281a4b 100644
--- a/sw/util/vbaswobj.component
+++ b/sw/util/vbaswobj.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaswobj"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SwVbaDocument">
<service name="ooo.vba.word.Document"/>
More information about the Libreoffice-commits
mailing list