diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-11 14:57:32 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-14 11:02:11 +0000 |
| commit | dd7c746c184de38104aa1f057886d7c538e2e0b2 (patch) | |
| tree | a71cc5554e53438808aead863bdf6abde2f40e01 | |
| parent | 11974b31bc5f2718d9f4da47bf376ee37e57deeb (diff) | |
Extension shared library components must not use the "prefix" feature
...at least no non-bundled ones, see 9dfcee9266c9769153444cdcd4ab0e6e636c3eb6
"Not being able to honor a 'prefix' is a rather hard error" and the description
there how that can lead to a crash when using mysql-connector-ooo.oxt: "'rm -rf
instdir/*/share/extensions/mysql-connector-ooo', 'instdir/*/program/soffice
workdir/*/Extension/mysql-connector.oxt', install the [extension] per-user, then
'File - New - Database - Connect to an existing database: MySQL - Next >> -
Connect directly - Next >> - Database name: foo - Server / Port - Server: bar -
Next >> - Test Connection', crash."
This is a partial revert of cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 "prefix all
component_getFactory methods."
Change-Id: Ia7a6272eb0597e3b3bbf4ab333174b3232448539
(cherry picked from commit 3bafe5f5f529f6539363c5a291dd13ef1e2cbbde)
Reviewed-on: https://gerrit.libreoffice.org/6210
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | mysqlc/source/mysqlc.component | 2 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_services.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component index ae16484d43b4..e4295110f84b 100644 --- a/mysqlc/source/mysqlc.component +++ b/mysqlc/source/mysqlc.component @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> -<component xmlns="http://openoffice.org/2010/uno-components" prefix="mysqlc" +<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> <implementation name="com.sun.star.comp.sdbc.mysqlc.MysqlCDriver"> <service name="com.sun.star.sdbc.Driver"/> diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index cc7e8e0df652..af1cabeee937 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -76,7 +76,7 @@ struct ProviderRequest /* {{{ component_getFactory -I- */ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysqlc_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) |