Use prefixes for these UNO components

Change-Id: I719f10818fd211bfe60e5351a5de53a716fdf20f

Use prefixes for these UNO components
Change-Id: I719f10818fd211bfe60e5351a5de53a716fdf20f
f42a9309 · Tor Lillqvist · 36a2db37 · f42a9309 · f42a9309 · f42a9309
Kaydet (Commit) f42a9309 authored Eki 01, 2012 tarafından Tor Lillqvist
38 changed files
--- 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);
 }

--- 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;


--- 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"/>

--- 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"/>

--- 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*/)

--- 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"/>

--- 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*/)

--- 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"/>

--- 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*/)

--- 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"/>

--- 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*/)

--- 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"/>

--- 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*/)

--- 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"/>

--- 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*/)

--- 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"/>

--- 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"/>

--- 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*/)

--- 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*)

--- 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"/>

--- 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*)

--- 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"/>

--- 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(

--- 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"/>

--- 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*/)

--- 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*/)

--- 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"/>

--- 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"/>

--- 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*/)

--- 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"/>

--- 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"/>

--- 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*/)

--- 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"/>

--- 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"/>

--- 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 );

--- 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

--- 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;


--- 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"/>