summaryrefslogtreecommitdiff
path: root/ucb
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 /ucb
parent0fd044f85f92ad76b07c44f95bb1b810834d3805 (diff)
add configmgr, ucb1, ucpfile1, xcr to libmerged
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/core/ucb1.component2
-rw-r--r--ucb/source/core/ucbserv.cxx2
-rw-r--r--ucb/source/ucp/file/prov.cxx2
-rw-r--r--ucb/source/ucp/file/ucpfile1.component2
4 files changed, 4 insertions, 4 deletions
diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component
index e9d408822cc9..7dff3113cbbe 100644
--- a/ucb/source/core/ucb1.component
+++ b/ucb/source/core/ucb1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucb"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.CommandEnvironment">
<service name="com.sun.star.ucb.CommandEnvironment"/>
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 33a689273557..1eb6ddbec6dc 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -40,7 +40,7 @@ using ::rtl::OUString;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index c71191aae11e..bd9889e8063e 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::ucb;
using namespace com::sun::star::container;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component
index 28032451220a..7cfe70c8e7c0 100644
--- a/ucb/source/ucp/file/ucpfile1.component
+++ b/ucb/source/ucp/file/ucpfile1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.FileProvider">
<service name="com.sun.star.ucb.FileContentProvider"/>