basctl/source/basicide/register.cxx | 2 +-
basctl/util/basctl.component | 2 +-
binaryurp/source/binaryurp.component | 2 +-
binaryurp/source/bridgefactory.cxx | 2 +-
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2 +-
connectivity/source/cpool/Zregistration.cxx | 2 +-
connectivity/source/cpool/dbpool2.component | 2 +-
connectivity/source/dbtools/dbtools.component | 2 +-
connectivity/source/drivers/ado/Aservices.cxx | 4
++--
connectivity/source/drivers/ado/ado.component | 2 +-
connectivity/source/drivers/calc/Cservices.cxx | 2 +-
connectivity/source/drivers/calc/calc.component | 2 +-
connectivity/source/drivers/dbase/Dservices.cxx | 2 +-
connectivity/source/drivers/dbase/dbase.component | 2 +-
connectivity/source/drivers/evoab2/NServices.cxx | 2 +-
connectivity/source/drivers/evoab2/evoab.component | 2 +-
connectivity/source/drivers/flat/Eservices.cxx | 2 +-
connectivity/source/drivers/flat/flat.component | 2 +-
connectivity/source/drivers/hsqldb/Hservices.cxx | 2 +-
connectivity/source/drivers/hsqldb/hsqldb.component | 2 +-
connectivity/source/drivers/jdbc/jdbc.component | 2 +-
connectivity/source/drivers/jdbc/jservices.cxx | 2 +-
connectivity/source/drivers/kab/KServices.cxx | 2 +-
connectivity/source/drivers/kab/kab1.component | 2 +-
connectivity/source/drivers/macab/MacabServices.cxx | 2 +-
connectivity/source/drivers/macab/macab1.component | 2 +-
connectivity/source/drivers/mork/MServices.cxx | 2 +-
connectivity/source/drivers/mork/mork.component | 2 +-
connectivity/source/drivers/mozab/MServices.cxx | 2 +-
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 2 +-
connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component | 2 +-
connectivity/source/drivers/mozab/mozab.component | 2 +-
connectivity/source/drivers/mysql/Yservices.cxx | 2 +-
connectivity/source/drivers/mysql/mysql.component | 2 +-
connectivity/source/drivers/odbc/odbc.component | 2 +-
connectivity/source/drivers/odbc/oservices.cxx | 2 +-
connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component | 2 +-
connectivity/source/drivers/postgresql/postgresql-sdbc.component | 2 +-
connectivity/source/drivers/postgresql/pq_connection.cxx | 2 +-
connectivity/source/drivers/postgresql/pq_driver.cxx | 2 +-
connectivity/source/manager/mregistration.cxx | 2 +-
connectivity/source/manager/sdbc2.component | 2 +-
cui/source/uno/services.cxx | 2 +-
cui/util/cui.component | 2 +-
cui/util/cui.map | 2 +-
45 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit a8ea2a423649d8df4f5df32132fd72a1ed1c7462
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 21:54:40 2012 +0300
Use prefix
Change-Id: Id3d3df7869f6efb548ae44c3a6cac23dc1e21774
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index a63fd3c..8164dea 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -52,7 +52,7 @@ namespace
};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char
const * implName, void * serviceManager, void * registryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char
const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager,
registryKey, entries);
}
diff --git a/cui/util/cui.component b/cui/util/cui.component
index 43cfdb5..ab11293 100644
--- a/cui/util/cui.component
+++ b/cui/util/cui.component
@@ -30,7 +30,7 @@
* instead of those above.
* -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="cui"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.cui.ColorPicker">
<service name="com.sun.star.ui.dialogs.ColorPicker"/>
diff --git a/cui/util/cui.map b/cui/util/cui.map
index e0809cf..5f35b16 100644
--- a/cui/util/cui.map
+++ b/cui/util/cui.map
@@ -2,7 +2,7 @@ UDK_3_0_0 {
global:
CreateDialogFactory;
GetSpecialCharsForEdit;
- component_getFactory;
+ cui_component_getFactory;
local:
*;
};
commit cbf2008355682ad7bfffaadc0d14a0f6cb9c3428
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 21:54:23 2012 +0300
Use prefix
Change-Id: Ic1fcb3078757d7948bbb4ddb155ab9584e861c12
diff --git a/binaryurp/source/binaryurp.component
b/binaryurp/source/binaryurp.component
index f590854..37fb96f 100644
--- a/binaryurp/source/binaryurp.component
+++ b/binaryurp/source/binaryurp.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="binaryurp"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.bridge.BridgeFactory">
<service name="com.sun.star.bridge.BridgeFactory"/>
diff --git a/binaryurp/source/bridgefactory.cxx
b/binaryurp/source/bridgefactory.cxx
index 634ddb3..4050e06 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -197,7 +197,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
commit 7b089e2ccccb9872e6bd01af6ed8cefbd8160364
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 21:54:06 2012 +0300
Use prefix
Change-Id: Ide081f18af82e68b55d6d48168a0a567e5e64f04
diff --git a/basctl/source/basicide/register.cxx
b/basctl/source/basicide/register.cxx
index b284659..563cc62 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -36,7 +36,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 basctl_component_getFactory( const
sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey )
{
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component
index d9ecf79..a42ddff 100644
--- a/basctl/util/basctl.component
+++ b/basctl/util/basctl.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="basctl"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.basic.BasicIDE">
<service name="com.sun.star.script.BasicIDE"/>
commit f42a9309760565d24619bad9ee1f5561ce89c14b
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Oct 1 21:51:40 2012 +0300
Use prefixes for these UNO components
Change-Id: I719f10818fd211bfe60e5351a5de53a716fdf20f
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index a03d6c1..4657021 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -884,7 +884,7 @@ extern "C"
{
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char*
implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void*
registryKey)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const
sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory*
serviceManager, void* registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager,
registryKey, entries);
}
diff --git a/connectivity/source/cpool/Zregistration.cxx
b/connectivity/source/cpool/Zregistration.cxx
index 71fd7f2..6803980 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -34,7 +34,7 @@ extern "C"
{
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char*
_pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager,
void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const
sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory*
_pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
diff --git a/connectivity/source/cpool/dbpool2.component
b/connectivity/source/cpool/dbpool2.component
index 43e4c79..f6876fb 100644
--- a/connectivity/source/cpool/dbpool2.component
+++ b/connectivity/source/cpool/dbpool2.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbpool2"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.sdbc.OConnectionPool">
<service name="com.sun.star.sdbc.ConnectionPool"/>
diff --git a/connectivity/source/dbtools/dbtools.component
b/connectivity/source/dbtools/dbtools.component
index 9fb6d07..532884d 100644
--- a/connectivity/source/dbtools/dbtools.component
+++ b/connectivity/source/dbtools/dbtools.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbtools"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet">
<service name="com.sun.star.sdbc.ResultSet"/>
diff --git a/connectivity/source/drivers/ado/Aservices.cxx
b/connectivity/source/drivers/ado/Aservices.cxx
index 3ccae9d..ec5cebe 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
ado_component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment ** /*ppEnv*/)
{
@@ -83,7 +83,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnviron
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/ado/ado.component
b/connectivity/source/drivers/ado/ado.component
index 21007a4..9286ca0 100644
--- a/connectivity/source/drivers/ado/ado.component
+++ b/connectivity/source/drivers/ado/ado.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ado"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.ado.ODriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/calc/Cservices.cxx
b/connectivity/source/drivers/calc/Cservices.cxx
index c173f71..217863e 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
connectivity_calc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/calc/calc.component
b/connectivity/source/drivers/calc/calc.component
index 0e957bb..158a065 100644
--- a/connectivity/source/drivers/calc/calc.component
+++ b/connectivity/source/drivers/calc/calc.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary"
prefix="connectivity_calc"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.calc.ODriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx
b/connectivity/source/drivers/dbase/Dservices.cxx
index cd05304..15cc9d4 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbase_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/dbase/dbase.component
b/connectivity/source/drivers/dbase/dbase.component
index b491b2d..8eda9a8 100644
--- a/connectivity/source/drivers/dbase/dbase.component
+++ b/connectivity/source/drivers/dbase/dbase.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbase"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx
b/connectivity/source/drivers/evoab2/NServices.cxx
index bd51216..e922073 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -77,7 +77,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL evoab2_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/evoab2/evoab.component
b/connectivity/source/drivers/evoab2/evoab.component
index 0109839..c33e80a 100644
--- a/connectivity/source/drivers/evoab2/evoab.component
+++ b/connectivity/source/drivers/evoab2/evoab.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="evoab2"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/flat/Eservices.cxx
b/connectivity/source/drivers/flat/Eservices.cxx
index 7b65eed..db3667c 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/flat/flat.component
b/connectivity/source/drivers/flat/flat.component
index d5e820b..e1ccb84 100644
--- a/connectivity/source/drivers/flat/flat.component
+++ b/connectivity/source/drivers/flat/flat.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="flat"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.flat.ODriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx
b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 549a3a9..86269c1 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL hsqldb_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component
b/connectivity/source/drivers/hsqldb/hsqldb.component
index a911be7..8c74131 100644
--- a/connectivity/source/drivers/hsqldb/hsqldb.component
+++ b/connectivity/source/drivers/hsqldb/hsqldb.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="hsqldb"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/jdbc/jdbc.component
b/connectivity/source/drivers/jdbc/jdbc.component
index 32e02a8..5b8b151 100644
--- a/connectivity/source/drivers/jdbc/jdbc.component
+++ b/connectivity/source/drivers/jdbc/jdbc.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="jdbc"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.JDBCDriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx
b/connectivity/source/drivers/jdbc/jservices.cxx
index fa5da2a..8ad3d81 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -89,7 +89,7 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine";
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/kab/KServices.cxx
b/connectivity/source/drivers/kab/KServices.cxx
index eb59910..2e1a6bc 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL kab_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void*)
diff --git a/connectivity/source/drivers/kab/kab1.component
b/connectivity/source/drivers/kab/kab1.component
index f507ecb..4123f66 100644
--- a/connectivity/source/drivers/kab/kab1.component
+++ b/connectivity/source/drivers/kab/kab1.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="kab"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.kab.Driver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx
b/connectivity/source/drivers/macab/MacabServices.cxx
index 9f42b99..3944bf8 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL macab_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void*)
diff --git a/connectivity/source/drivers/macab/macab1.component
b/connectivity/source/drivers/macab/macab1.component
index 9f79696..90ff018 100644
--- a/connectivity/source/drivers/macab/macab1.component
+++ b/connectivity/source/drivers/macab/macab1.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="macab"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.macab.Driver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/mork/MServices.cxx
b/connectivity/source/drivers/mork/MServices.cxx
index 3dfeb20..07395e6 100644
--- a/connectivity/source/drivers/mork/MServices.cxx
+++ b/connectivity/source/drivers/mork/MServices.cxx
@@ -27,7 +27,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mork_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/connectivity/source/drivers/mork/mork.component
b/connectivity/source/drivers/mork/mork.component
index b8124fa..8b3e95d 100644
--- a/connectivity/source/drivers/mork/mork.component
+++ b/connectivity/source/drivers/mork/mork.component
@@ -8,7 +8,7 @@
*
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="mork"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.MorkDriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/mozab/MServices.cxx
b/connectivity/source/drivers/mozab/MServices.cxx
index 676a920..725a681 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -111,7 +111,7 @@ typedef void* (SAL_CALL *
OMozillaBootstrap_CreateInstanceFunction)(const Refere
return NULL;
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 7878fcb..27d328a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -237,7 +237,7 @@ static Reference< XInterface > SAL_CALL createInstance(
const Reference< XMultiS
return *pBootstrap;
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
mozbootstrap_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
index e5cc8cb..3b41e02 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="mozbootstrap"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
<service name="com.sun.star.mozilla.MozillaBootstrap"/>
diff --git a/connectivity/source/drivers/mozab/mozab.component
b/connectivity/source/drivers/mozab/mozab.component
index 6521e26..be63b8e 100644
--- a/connectivity/source/drivers/mozab/mozab.component
+++ b/connectivity/source/drivers/mozab/mozab.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="mozab"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
<service name="com.sun.star.mozilla.MozillaBootstrap"/>
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx
b/connectivity/source/drivers/mysql/Yservices.cxx
index 83ae495..ee2be92 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/connectivity/source/drivers/mysql/mysql.component
b/connectivity/source/drivers/mysql/mysql.component
index 758cb34..18bf73c 100644
--- a/connectivity/source/drivers/mysql/mysql.component
+++ b/connectivity/source/drivers/mysql/mysql.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="mysql"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.comp.drivers.MySQL.Driver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/odbc/odbc.component
b/connectivity/source/drivers/odbc/odbc.component
index 01acb0d..ecbd021 100644
--- a/connectivity/source/drivers/odbc/odbc.component
+++ b/connectivity/source/drivers/odbc/odbc.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="odbc"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.ODBCDriver">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/odbc/oservices.cxx
b/connectivity/source/drivers/odbc/oservices.cxx
index 807cf60..73837a7 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL odbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git
a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
index 407a0e6..79c33c4 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
@@ -27,7 +27,7 @@
* instead of those above.
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary"
prefix="postgresql_sdbc_impl"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.comp.connectivity.pq.Connection.noext">
<service name="com.sun.star.sdbc.Connection"/>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index f691963..28d468b 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
@@ -27,7 +27,7 @@
* instead of those above.
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.comp.connectivity.pq.Driver.noext">
<service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index bd20f9c..a2c846d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -785,7 +785,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_impl_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx
b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 5a8dd9c..78289f3 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -342,7 +342,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
// need to extract the defaultcontext, because the way, sdbc
diff --git a/connectivity/source/manager/mregistration.cxx
b/connectivity/source/manager/mregistration.cxx
index b13082f..af01a22 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -34,7 +34,7 @@ extern "C"
{
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char*
_pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager,
void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char*
_pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager,
void* /*_pRegistryKey*/)
{
void* pRet = NULL;
diff --git a/connectivity/source/manager/sdbc2.component
b/connectivity/source/manager/sdbc2.component
index 960f44a..2001372 100644
--- a/connectivity/source/manager/sdbc2.component
+++ b/connectivity/source/manager/sdbc2.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sdbc2"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager">
<service name="com.sun.star.sdbc.DriverManager"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
