[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/postgresql

[René Engelhard]

 patches/postgresql/sdbc-postgresql.diff |   41 ++------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

New commits:
commit c0866df2b9cd3415d3a0af556cad87631af086c9
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 15 16:23:23 2010 +0100

    remove DataAccess.xcu in PostgreSQL SDBC Driver (i#113494)

diff --git a/patches/postgresql/sdbc-postgresql.diff b/patches/postgresql/sdbc-postgresql.diff
index bdbac28..0b978e3 100644
--- a/patches/postgresql/sdbc-postgresql.diff
+++ b/patches/postgresql/sdbc-postgresql.diff
@@ -1,6 +1,5 @@
 ---
- .../source/drivers/postgresql/DataAccess.xcu       |   16 +
- connectivity/source/drivers/postgresql/makefile.mk |  224 ++
+ connectivity/source/drivers/postgresql/makefile.mk |  214 ++
  .../source/drivers/postgresql/postgresql-sdbc.uno  |    2 +
  .../source/drivers/postgresql/postgresql.xcu       |   50 +
  .../source/drivers/postgresql/pq_allocator.hxx     |  225 ++
@@ -70,8 +69,7 @@
  .../source/drivers/postgresql/pq_xview.hxx         |  133 ++
  .../source/drivers/postgresql/pq_xviews.cxx        |  304 +++
  .../source/drivers/postgresql/pq_xviews.hxx        |  118 ++
- 71 files changed, 21690 insertions(+), 0 deletions(-)
- create mode 100644 connectivity/source/drivers/postgresql/DataAccess.xcu
+ 70 files changed, 21664 insertions(+), 0 deletions(-)
  create mode 100644 connectivity/source/drivers/postgresql/makefile.mk
  create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno
  create mode 100644 connectivity/source/drivers/postgresql/postgresql.xcu
@@ -143,35 +141,12 @@
  create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.cxx
  create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.hxx
 
-diff --git connectivity/source/drivers/postgresql/DataAccess.xcu connectivity/source/drivers/postgresql/DataAccess.xcu
-new file mode 100644
-index 0000000..6553971
---- /dev/null
-+++ connectivity/source/drivers/postgresql/DataAccess.xcu
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DataAccess" oor:package="org.openoffice.Office">
-+ <node oor:name="UserDefinedDriverSettings">
-+       <node oor:name="Postgresql Driver" oor:op="replace">
-+         <prop oor:name="DriverPageDisplayName">
-+           <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value>
-+         </prop>
-+         <prop oor:name="DriverTypeDisplayName">
-+           <value>postgresql</value>
-+         </prop>
-+         <prop oor:name="DriverDsnPrefix">
-+           <value>sdbc:postgresql:</value>
-+         </prop>
-+       </node>
-+ </node>
-+</oor:node>
-\ No newline at end of file
 diff --git connectivity/source/drivers/postgresql/makefile.mk connectivity/source/drivers/postgresql/makefile.mk
 new file mode 100644
 index 0000000..1afe9c1
 --- /dev/null
 +++ connectivity/source/drivers/postgresql/makefile.mk
-@@ -0,0 +1,224 @@
+@@ -0,0 +1,214 @@
 +#*************************************************************************
 +#
 +#   $RCSfile: makefile.mk,v $
@@ -367,7 +342,6 @@ index 0000000..1afe9c1
 +
 +
 +$(DLLDEST)$/$(DRIVERNAME): \
-+        $(DLLDEST)$/DataAccess.xcu \
 +        $(DLLDEST)$/postgresql.xcu \
 +        $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
 +        $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
@@ -377,21 +351,12 @@ index 0000000..1afe9c1
 +            $(SHL1TARGET)$(DLLPOST) \
 +            $(SHL2TARGET)$(DLLPOST) \
 +            $(SHL1TARGET)$(INI_EXT) \
-+            DataAccess.xcu \
 +            postgresql.xcu
 +
 +$(DLLDEST)$/postgresql.xcu : postgresql.xcu
 +    -rm -f $@
 +    cat postgresql.xcu > $@
 +
-+$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
-+    -rm -f $@
-+    cat DataAccess.xcu | \
-+        sed s/PQ_SDBC_MAJOR/$(PQ_SDBC_MAJOR)/ | \
-+        sed s/PQ_SDBC_MINOR/$(PQ_SDBC_MINOR)/ | \
-+        sed s/PQ_SDBC_MICRO/$(PQ_SDBC_MICRO)/ > $@
-+
-+
 +strip :
 +.IF "$(GUI)"!="WNT"
 +    strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST)