mysqlc/source/mysqlc.component | 2 +-
mysqlc/source/mysqlc_services.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c23fa104084fccd8aa3bd930499406380c410d02
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 11 14:57:32 2013 +0200
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/6209
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component
index ae16484..e429511 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 cc7e8e0..af1cabe 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 */)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
