summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-02-17 23:15:26 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-02-19 19:24:34 +0100
commita62f426993835770a35f6d366047d8d5d6322e12 (patch)
tree7c8c93d34eff9acf2d5cf026f797cb60fec173a2 /configmgr
parent0fd044f85f92ad76b07c44f95bb1b810834d3805 (diff)
add configmgr, ucb1, ucpfile1, xcr to libmerged
Diffstat (limited to 'configmgr')
-rwxr-xr-xconfigmgr/source/configmgr.component2
-rw-r--r--configmgr/source/services.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component
index 9ad4c79eed0b..4cc8f1b2cf2e 100755
--- a/configmgr/source/configmgr.component
+++ b/configmgr/source/configmgr.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="configmgr"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.ConfigurationProvider">
<service name="com.sun.star.configuration.ConfigurationProvider"/>
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 656f9d418d9b..72d610141733 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -87,7 +87,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(