[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 2 commits - connectivity/registry connectivity/source
David Tardon
dtardon at kemper.freedesktop.org
Thu Apr 26 06:41:10 PDT 2012
connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++--
connectivity/source/drivers/postgresql/pq_driver.cxx | 2 +-
15 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit a52cdf94bf2429ce5917dcd715aea1a5dacd1e0e
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 26 15:37:49 2012 +0200
fix configuration processing
diff --git a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 58bfcf8..f1d4aa2 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<node oor:name="Installed" install:module="ado">
<node oor:name="sdbc:ado:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.ado.ODriver</value>
diff --git a/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
index b7b494f..10c7044 100644
--- a/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="calc">
<node oor:name="sdbc:calc:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.calc.ODriver</value>
diff --git a/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
index f5de1d5..d617089 100644
--- a/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="dbase">
<node oor:name="sdbc:dbase:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.dbase.ODriver</value>
diff --git a/connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu
index a7c81d9..ed68233 100644
--- a/connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="evoab2">
<node oor:name="sdbc:address:evolution:local" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.evoab.OEvoabDriver</value>
diff --git a/connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu
index a54394e..669429a 100644
--- a/connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="flat">
<node oor:name="sdbc:flat:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.flat.ODriver</value>
diff --git a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu
index f97b5e3..f9886b3 100644
--- a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="hsqldb">
<node oor:name="sdbc:embedded:hsqldb" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.sdbcx.comp.hsqldb.Driver</value>
diff --git a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index 2afaa54..db33568 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="jdbc">
<node oor:name="jdbc:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.JDBCDriver</value>
diff --git a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu
index d350014..11bf1da 100644
--- a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="kab">
<node oor:name="sdbc:address:kab" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.kab.Driver</value>
diff --git a/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
index 0845bc9..f23a9a3 100644
--- a/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="macab">
<node oor:name="sdbc:address:macab" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.macab.Driver</value>
diff --git a/connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu
index e554e46..cf62202 100644
--- a/connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="mozab">
<node oor:name="sdbc:address:outlook" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.MozabDriver</value>
diff --git a/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu
index d6a6317..3224f1d 100644
--- a/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="mozab2">
<node oor:name="sdbc:address:mozilla:" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.MozabDriver</value>
diff --git a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
index afc5c0d..fde2ef1 100644
--- a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="mysql">
<node oor:name="sdbc:mysql:jdbc:*" oor:op="replace">
<prop oor:name="Driver">
<value>org.openoffice.comp.drivers.MySQL.Driver</value>
diff --git a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index c0d3939..81cef90 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="odbc">
<node oor:name="sdbc:odbc:*" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.ODBCDriver</value>
diff --git a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
index d9bcc7c..8958123 100644
--- a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -52,8 +52,8 @@
* instead of those above.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="postgresql">
<node oor:name="sdbc:postgresql:*" oor:op="replace">
<prop oor:name="Driver">
<value>org.openoffice.comp.connectivity.pq.Driver</value>
commit 3025f016bca1ae39c9491785d9463126db7e9288
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 26 12:14:11 2012 +0200
component_getFactory must be exported
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 86d37be..98ee8ea 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -344,7 +344,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
// need to extract the defaultcontext, because the way, sdbc
More information about the Libreoffice-commits
mailing list