summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMatus Kukan <matus.kukan@gmail.com>2011-06-24 14:53:52 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-06-24 14:58:26 +0100
commit25aeecfdc86de22e2ec29a9ed9a043b4af8542ab (patch)
tree88f7abffde1f4dec84d9640ebe16a38cbf497a55 /xmloff
parent44f80498068bfdbbea42331374ba0923b1d8a49c (diff)
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/facreg.cxx4
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx6
-rwxr-xr-xxmloff/source/transform/xof.component2
-rwxr-xr-xxmloff/util/xo.component2
4 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index e50ecad6710d..b54ea767a1ab 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -164,7 +164,7 @@ extern "C"
{
#endif
-XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+XMLOFF_DLLPUBLIC void SAL_CALL xo_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -178,7 +178,7 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal
classname##_getSupportedServiceNames() );\
}
-XMLOFF_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
if( pServiceManager )
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 4db6da9a91b5..8cb4cf53ea27 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -142,12 +142,12 @@ extern "C"
{
#endif
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL xof_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = NULL;
if( pServiceManager )
@@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl
}
catch( uno::Exception& )
{
- OSL_FAIL( "xof::component_getFactory: Exception!" );
+ OSL_FAIL( "xof::xof_component_getFactory: Exception!" );
}
}
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component
index 8f9c88f7fa0d..b5254b1c2b97 100755
--- a/xmloff/source/transform/xof.component
+++ b/xmloff/source/transform/xof.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xof"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Calc.XMLContentImporter">
<service name="com.sun.star.comp.Calc.XMLContentImporter"/>
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 7fe2119636d1..1bbba25d3e1d 100755
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xo"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SchXMLExport.Compact">
<service name="com.sun.star.comp.Chart.XMLExporter"/>