[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-8-gf106efe
The following commit has been merged in the master branch:
commit 08a8292fbd91f0ebe112e9051b8f2019c1faa075
Author: Rene Engelhard <rene@debian.org>
Date: Tue Oct 18 14:51:01 2011 +0200
debian/patches/update-sdbc-postgresql.diff: update to 0.8.1
diff --git a/changelog b/changelog
index 8c7bbe2..23fef91 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
libreoffice (1:3.4.3-5) UNRELEASED; urgency=low
+ * debian/patches/update-sdbc-postgresql.diff: update to 0.8.1
+
* debian/rules:
- don't try to use internal jfreereport on ia64; disable the SRB
instead.
@@ -8,7 +10,7 @@ libreoffice (1:3.4.3-5) UNRELEASED; urgency=low
- point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
does not suffice but we should reference the source and not binaries
- -- Rene Engelhard <rene@debian.org> Tue, 18 Oct 2011 01:52:39 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 18 Oct 2011 14:31:19 +0200
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/patches/update-sdbc-postgresql.diff b/patches/update-sdbc-postgresql.diff
index 217c5f3..d00b2fe 100644
--- a/patches/update-sdbc-postgresql.diff
+++ b/patches/update-sdbc-postgresql.diff
@@ -1657,12 +1657,10 @@ index 74e8046..0000000
diff --git libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff
new file mode 100644
index 0000000..1a69913
---- /dev/null
-+++ libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff
-@@ -0,0 +1,24145 @@
+@@ -0,0 +1,22318 @@
+diff -urN connectivity/prj/build.lst connectivity/prj/build.lst
-+--- connectivity/prj/build.lst 2011-09-08 12:00:34.000000000 +0200
-++++ connectivity/prj/build.lst 2011-09-09 12:00:07.000000000 +0200
++--- connectivity/prj/build.lst 2011-10-16 17:11:47.000000000 +0200
+++++ connectivity/prj/build.lst 2011-10-16 17:28:41.000000000 +0200
+@@ -18,6 +18,7 @@
+ cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
+ cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
@@ -1673,12 +1671,12 @@ index 0000000..1a69913
+ cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
+diff -urN connectivity/source/drivers/postgresql/description/description_en-US.txt connectivity/source/drivers/postgresql/description/description_en-US.txt
+--- connectivity/source/drivers/postgresql/description/description_en-US.txt 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/description/description_en-US.txt 2011-09-09 12:01:04.000000000 +0200
+++++ connectivity/source/drivers/postgresql/description/description_en-US.txt 2011-10-16 17:28:42.000000000 +0200
+@@ -0,0 +1 @@
++A native PostgreSQL database driver for LibreOffice. It is faster, seamlessly integrated and there is no need to install and setup a JDBC or ODBC driver separately. Compatible with PostgreSQL version 8.4 and later.
+diff -urN connectivity/source/drivers/postgresql/description.xml connectivity/source/drivers/postgresql/description.xml
+--- connectivity/source/drivers/postgresql/description.xml 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/description.xml 2011-09-09 12:00:58.000000000 +0200
+++++ connectivity/source/drivers/postgresql/description.xml 2011-10-16 17:28:42.000000000 +0200
+@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<description xmlns="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dep="http://openoffice.org/extensions/description/2006";>
@@ -1699,29 +1697,10 @@ index 0000000..1a69913
++</description>
+diff -urN connectivity/source/drivers/postgresql/makefile.mk connectivity/source/drivers/postgresql/makefile.mk
+--- connectivity/source/drivers/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/makefile.mk 2011-09-09 12:01:25.000000000 +0200
-+@@ -0,0 +1,231 @@
+++++ connectivity/source/drivers/postgresql/makefile.mk 2011-10-16 17:28:44.000000000 +0200
++@@ -0,0 +1,196 @@
++#*************************************************************************
++#
-++# $RCSfile: makefile.mk,v $
-++#
-++# $Revision: 1.1.2.15 $
-++#
-++# last change: $Author: jbu $ $Date: 2010/02/07 12:31:34 $
-++#
-++# The Contents of this file are made available subject to the terms of
-++# either of the following licenses
-++#
-++# - GNU Lesser General Public License Version 2.1
-++# - Sun Industry Standards Source License Version 1.1
-++#
-++# Sun Microsystems Inc., October, 2000
-++#
-++# GNU Lesser General Public License Version 2.1
-++# =============================================
-++# Copyright 2000 by Sun Microsystems, Inc.
-++# 901 San Antonio Road, Palo Alto, CA 94303, USA
-++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
@@ -1736,31 +1715,15 @@ index 0000000..1a69913
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
-++#
-++# Sun Industry Standards Source License Version 1.1
-++# =================================================
-++# The contents of this file are subject to the Sun Industry Standards
-++# Source License Version 1.1 (the "License"); You may not use this file
-++# except in compliance with the License. You may obtain a copy of the
-++# License at http://www.openoffice.org/license.html.
-++#
-++# Software provided under this License is provided on an "AS IS" basis,
-++# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++# See the License for the specific provisions governing your rights and
-++# obligations concerning the Software.
-++#
++# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
++#
++# Copyright: 2000 by Sun Microsystems, Inc.
+++# 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++#
++# All Rights Reserved.
++#
++# Contributor(s): _______________________________________
++#
-++#
-++#
++#*************************************************************************
++PRJ=..$/..$/..
++
@@ -1784,18 +1747,18 @@ index 0000000..1a69913
++
++PQ_SDBC_MAJOR=0
++PQ_SDBC_MINOR=8
-++PQ_SDBC_MICRO=0
+++PQ_SDBC_MICRO=1
++PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
++.IF "$(SYSTEM_POSTGRESQL)" == "YES"
-++POSTGRESQL_MAJOR:=$(shell pg_config --version | awk '{ print $$2 }' | cut -d. -f1)
-++POSTGRESQL_MINOR:=$(shell pg_config --version | awk '{ print $$2 }' | cut -d. -f2)
-++POSTGRESQL_MICRO:=$(shell pg_config --version | awk '{ print $$2 }' | cut -d. -f3)
+++POSTGRESQL_MAJOR:=$(shell @pg_config --version | awk '{ print $$2 }' | cut -d. -f1)
+++POSTGRESQL_MINOR:=$(shell @pg_config --version | awk '{ print $$2 }' | cut -d. -f2)
+++POSTGRESQL_MICRO:=$(shell @pg_config --version | awk '{ print $$2 }' | cut -d. -f3)
++.ENDIF
++
++.IF "$(SYSTEM_POSTGRESQL)" != "YES"
++POSTGRESQL_INCLUDES=-I$(SOLARINCDIR)$/postgresql
++.ELSE
-++POSTGRESQL_INCLUDES:=-I$(shell pg_config --includedir)
+++POSTGRESQL_INCLUDES:=-I$(shell @pg_config --includedir)
++.ENDIF
++
++CFLAGS+=$(POSTGRESQL_INCLUDES) \
@@ -1934,7 +1897,7 @@ index 0000000..1a69913
++.ENDIF
+diff -urN connectivity/source/drivers/postgresql/manifest.xml connectivity/source/drivers/postgresql/manifest.xml
+--- connectivity/source/drivers/postgresql/manifest.xml 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/manifest.xml 2011-09-09 12:00:12.000000000 +0200
+++++ connectivity/source/drivers/postgresql/manifest.xml 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
@@ -1948,13 +1911,13 @@ index 0000000..1a69913
++</manifest:manifest>
+diff -urN connectivity/source/drivers/postgresql/postgresql-sdbc.uno connectivity/source/drivers/postgresql/postgresql-sdbc.uno
+--- connectivity/source/drivers/postgresql/postgresql-sdbc.uno 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/postgresql-sdbc.uno 2011-09-09 12:00:01.000000000 +0200
+++++ connectivity/source/drivers/postgresql/postgresql-sdbc.uno 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,2 @@
++[Bootstrap]
++PQ_LOGLEVEL=NONE
+diff -urN connectivity/source/drivers/postgresql/postgresql.xcu connectivity/source/drivers/postgresql/postgresql.xcu
+--- connectivity/source/drivers/postgresql/postgresql.xcu 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/postgresql.xcu 2011-09-09 12:01:09.000000000 +0200
+++++ connectivity/source/drivers/postgresql/postgresql.xcu 2011-10-16 17:28:43.000000000 +0200
+@@ -0,0 +1,84 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--***********************************************************************
@@ -2042,30 +2005,11 @@ index 0000000..1a69913
++<!-- End: -->
+diff -urN connectivity/source/drivers/postgresql/pq_allocator.hxx connectivity/source/drivers/postgresql/pq_allocator.hxx
+--- connectivity/source/drivers/postgresql/pq_allocator.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_allocator.hxx 2011-09-09 12:00:33.000000000 +0200
-+@@ -0,0 +1,240 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_allocator.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,203 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_allocator.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/08/28 21:24:00 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -2080,21 +2024,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
++ *
++ * Copyright: 2002 by Sun Microsystems, Inc.
@@ -2104,9 +2033,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): _______________________________________
++ *
-++ * Non-Sun changes:
-++ * * august 2011: implement one-argument construct member
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_ALLOCATOR_
@@ -2286,9 +2212,35 @@ index 0000000..1a69913
++#endif /* _PQ_ALLOCATOR_ */
+diff -urN connectivity/source/drivers/postgresql/pq_array.cxx connectivity/source/drivers/postgresql/pq_array.cxx
+--- connectivity/source/drivers/postgresql/pq_array.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_array.cxx 2011-09-09 12:00:36.000000000 +0200
-+@@ -0,0 +1,97 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_array.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,123 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+++ *
+++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ * All Rights Reserved.
+++ *
+++ * Contributor(s): Joerg Budischewski
+++ *
+++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
++
@@ -2387,30 +2339,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_array.hxx connectivity/source/drivers/postgresql/pq_array.hxx
+--- connectivity/source/drivers/postgresql/pq_array.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_array.hxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,130 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_array.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,95 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_array.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:28 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -2425,21 +2358,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -2449,7 +2367,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_ARRAY_HXX
@@ -2521,30 +2438,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.cxx connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+--- connectivity/source/drivers/postgresql/pq_baseresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_baseresultset.cxx 2011-09-09 12:01:13.000000000 +0200
-+@@ -0,0 +1,746 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_baseresultset.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,718 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_baseresultset.cxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:28 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -2559,21 +2457,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -2583,7 +2466,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <osl/thread.h>
@@ -2653,23 +2535,29 @@ index 0000000..1a69913
++ {
++ static Property aTable[] =
++ {
+++ // LEM TODO: this needs to be kept in sync with other, e.g. pq_statics.css:508
+++ // Should really share!
+++ // At least use for the handles the #define'd values in .hxx file...
++ Property(
++ OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0,
++ ::getCppuType( (OUString *)0) , 0 ),
++ Property(
-++ OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 0,
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1,
++ ::getBooleanCppuType() , 0 ),
++ Property(
-++ OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 0,
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2,
++ ::getCppuType( (sal_Int32 *)0) , 0 ),
++ Property(
-++ OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 0,
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3,
++ ::getCppuType( (sal_Int32 *)0) , 0 ),
++ Property(
-++ OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 0,
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("IsBookmarkable") ), 4,
+++ ::getBooleanCppuType() , 0 ),
+++ Property(
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 5,
++ ::getCppuType( (sal_Int32 *)0) , 0 ),
++ Property(
-++ OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 0,
+++ OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 6,
++ ::getCppuType( (sal_Int32 *)0) , 0 )
++ };
++ OSL_ASSERT( sizeof(aTable) / sizeof(Property) == BASERESULTSET_SIZE );
@@ -3174,6 +3062,7 @@ index 0000000..1a69913
++ break;
++ }
++ case BASERESULTSET_ESCAPE_PROCESSING:
+++ case BASERESULTSET_IS_BOOKMARKABLE:
++ {
++ sal_Bool val;
++ bRet = ( rValue >>= val );
@@ -3271,30 +3160,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_baseresultset.hxx connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+--- connectivity/source/drivers/postgresql/pq_baseresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_baseresultset.hxx 2011-09-09 12:01:05.000000000 +0200
-+@@ -0,0 +1,272 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_baseresultset.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,238 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_baseresultset.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -3309,21 +3179,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -3333,7 +3188,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PG_BASERESULTSET_HXX_
@@ -3355,10 +3209,11 @@ index 0000000..1a69913
++static const sal_Int32 BASERESULTSET_ESCAPE_PROCESSING = 1;
++static const sal_Int32 BASERESULTSET_FETCH_DIRECTION = 2;
++static const sal_Int32 BASERESULTSET_FETCH_SIZE = 3;
-++static const sal_Int32 BASERESULTSET_RESULT_SET_CONCURRENCY = 4;
-++static const sal_Int32 BASERESULTSET_RESULT_SET_TYPE = 5;
+++static const sal_Int32 BASERESULTSET_IS_BOOKMARKABLE = 4;
+++static const sal_Int32 BASERESULTSET_RESULT_SET_CONCURRENCY = 5;
+++static const sal_Int32 BASERESULTSET_RESULT_SET_TYPE = 6;
++
-++#define BASERESULTSET_SIZE 6
+++#define BASERESULTSET_SIZE 7
++
++class BaseResultSet : public cppu::OComponentHelper,
++ public cppu::OPropertySetHelper,
@@ -3547,9 +3402,9 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_common.hxx connectivity/source/drivers/postgresql/pq_common.hxx
+--- connectivity/source/drivers/postgresql/pq_common.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_common.hxx 2011-09-09 12:00:33.000000000 +0200
+++++ connectivity/source/drivers/postgresql/pq_common.hxx 2011-10-16 17:28:43.000000000 +0200
+@@ -0,0 +1,40 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
++ * Copyright 2011 Lionel Elie Mamane <lionel@mamane.lu>
@@ -3591,30 +3446,11 @@ index 0000000..1a69913
++#endif /* _PQ_COMMON_ */
+diff -urN connectivity/source/drivers/postgresql/pq_connection.cxx connectivity/source/drivers/postgresql/pq_connection.cxx
+--- connectivity/source/drivers/postgresql/pq_connection.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_connection.cxx 2011-09-09 12:01:20.000000000 +0200
-+@@ -0,0 +1,809 @@
+++++ connectivity/source/drivers/postgresql/pq_connection.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,774 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_connection.cxx,v $
-++ *
-++ * $Revision: 1.1.2.5 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/01/07 13:50:37 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -3629,21 +3465,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -3653,7 +3474,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <list>
@@ -4404,30 +4224,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_connection.hxx connectivity/source/drivers/postgresql/pq_connection.hxx
+--- connectivity/source/drivers/postgresql/pq_connection.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_connection.hxx 2011-09-09 12:01:22.000000000 +0200
-+@@ -0,0 +1,290 @@
+++++ connectivity/source/drivers/postgresql/pq_connection.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,256 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_connection.hxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:26:55 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -4442,21 +4243,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -4698,30 +4484,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.cxx connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+--- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 2011-09-09 12:01:22.000000000 +0200
-+@@ -0,0 +1,2632 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,2540 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_databasemetadata.cxx,v $
-++ *
-++ * $Revision: 1.1.2.11 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/02/15 20:04:47 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -4736,21 +4503,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -4792,6 +4544,7 @@ index 0000000..1a69913
++ * POSSIBILITY OF SUCH DAMAGE.
++ *
++ ************************************************************************/
+++
++#include <algorithm>
++#include "pq_databasemetadata.hxx"
++#include "pq_driver.hxx"
@@ -5556,6 +5309,10 @@ index 0000000..1a69913
++}
++
++
+++// LEM TODO: positioned (through cursor) updates and deletes seem
+++// to be supported; see {UPDATE,DELETE} /table/ (...) WHERE CURRENT OF /cursor_name/" syntax
+++// and http://www.postgresql.org/docs/9.1/static/view-pg-cursors.html
+++// http://www.postgresql.org/docs/9.1/static/libpq-example.html actually uses a cursor :)
++sal_Bool DatabaseMetaData::supportsPositionedDelete( ) throw (SQLException, RuntimeException)
++{
++ // LEM: jdbc driver says not, although the comments in it seem old
@@ -5743,7 +5500,7 @@ index 0000000..1a69913
++
++sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeException)
++{
-++ // jdbc driver seays 1GB, but http://www.postgresql.org/about/ says 1.6TB
+++ // jdbc driver says 1GB, but http://www.postgresql.org/about/ says 1.6TB
++ // and that 1GB is the maximum _field_ size
++ // The row limit does not fit into a sal_Int32
++ return 0;
@@ -6378,68 +6135,19 @@ index 0000000..1a69913
++ const OUString& columnNamePattern ) throw (SQLException, RuntimeException)
++{
++ //LEM TODO: implement! See JDBC driver
+++ // In the meantime, maybe better to throw exception SQLException with
+++ // SQLState == "IM001"
++ MutexGuard guard( m_refMutex->mutex );
++ checkClosed();
++ return new SequenceResultSet(
++ m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
++}
++
-++static void addPrivilegesToVector(
-++ sal_Int32 privilege, const OUString &catalog, const OUString & schema,
-++ const OUString &tableName, const OUString &grantor, const OUString &grantee,
-++ bool grantable, SequenceAnyVector &vec )
-++{
-++ Statics & statics = getStatics();
-++ for( int index = 1; index <= PRIVILEGE_MAX ; index = index << 1 )
-++ {
-++ OUString privname;
-++ switch( privilege & index )
-++ {
-++ case PRIVILEGE_SELECT:
-++ privname = statics.SELECT; break;
-++ case PRIVILEGE_UPDATE:
-++ privname = statics.UPDATE; break;
-++ case PRIVILEGE_INSERT:
-++ privname = statics.INSERT; break;
-++ case PRIVILEGE_DELETE:
-++ privname = statics.DELETE; break;
-++ case PRIVILEGE_RULE:
-++ privname = statics.RULE; break;
-++ case PRIVILEGE_REFERENCES:
-++ privname = statics.REFERENCES; break;
-++ case PRIVILEGE_TRIGGER:
-++ privname = statics.TRIGGER; break;
-++ case PRIVILEGE_EXECUTE:
-++ privname = statics.EXECUTE; break;
-++ case PRIVILEGE_USAGE:
-++ privname = statics.USAGE; break;
-++ case PRIVILEGE_CREATE:
-++ privname = statics.CREATE; break;
-++ case PRIVILEGE_TEMPORARY:
-++ privname = statics.TEMPORARY; break;
-++ default:
-++ break;
-++ }
-++
-++ Sequence< Any > seq( 7 );
-++ seq[0] <<= catalog;
-++ seq[1] <<= schema;
-++ seq[2] <<= tableName;
-++ seq[3] <<= grantor;
-++ seq[4] <<= grantee;
-++ seq[5] <<= privname;
-++ seq[6] <<= (grantable ? statics.YES : statics.NO );
-++ vec.push_back( seq );
-++ }
-++}
-++
-++
++::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges(
++ const ::com::sun::star::uno::Any& catalog,
++ const OUString& schemaPattern,
++ const OUString& tableNamePattern ) throw (SQLException, RuntimeException)
++{
-++ // LEM TODO: review
++ MutexGuard guard( m_refMutex->mutex );
++ checkClosed();
++
@@ -6453,68 +6161,54 @@ index 0000000..1a69913
++ log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
++ }
++
-++ // algorithm
-++
-++ // get the pg_class.relact item for the concrete table
-++ // get userid for username from pg_shadow (or pg_user view)
-++ // get the group names mentioned in pg_class.relact from pg_group
-++ // identify, which groups the current user belongs to
-++ // calculate the union of all permissions (1 public, 1 user, n groups)
-++
-++ // 1. TABLE_CAT string => table catalog (may be NULL )
-++ // 2. TABLE_SCHEM string => table schema (may be NULL )
-++ // 3. TABLE_NAME string => table name
-++ // 4. GRANTOR => grantor of access (may be NULL )
-++ // 5. GRANTEE string => grantee of access
-++ // 6. PRIVILEGE string => name of access (SELECT, INSERT, UPDATE, REFERENCES, ...)
-++ // 7. IS_GRANTABLE string => "YES" if grantee is permitted to grant to
-++ // others; "NO" if not; NULL if unknown
-++
++ Reference< XPreparedStatement > statement = m_origin->prepareStatement(
++ ASCII_STR(
-++ "SELECT pg_namespace.nspname, "
-++ "pg_class.relname, "
-++ "pg_class.relacl, "
-++ "pg_user.usename "
-++ "FROM pg_class, pg_user, pg_namespace "
-++ "WHERE pg_class.relowner = pg_user.usesysid "
-++ "AND ( pg_class.relkind = 'r' OR pg_class.relkind = 'v' ) "
-++ "AND pg_class.relnamespace = pg_namespace.oid "
-++ "AND pg_namespace.nspname LIKE ? "
-++ "AND pg_class.relname LIKE ?"
-++ "ORDER BY pg_namespace.nspname || pg_class.relname "
-++ ) );
+++ " WITH RECURSIVE roles AS ("
+++ " SELECT oid, rolname, rolinherit, rolsuper FROM pg_catalog.pg_roles"
+++ " UNION ALL"
+++ " VALUES (0, 'PUBLIC', TRUE, FALSE)"
+++ " ), direct_privs_oids AS ("
+++ " SELECT c.relname, c.relnamespace, c.relowner, (aclexplode(c.relacl)).*"
+++ " FROM pg_catalog.pg_class c"
+++ " WHERE c.relkind IN ('r', 'v') AND c.relname LIKE ?"
+++ " UNION ALL"
+++ " SELECT c.relname, c.relnamespace, c.relowner, c.relowner, c.relowner, p.privilege, TRUE"
+++ " FROM pg_catalog.pg_class c,"
+++ " (VALUES ('SELECT'), ('INSERT'), ('UPDATE'), ('DELETE'), ('TRUNCATE'), ('REFERENCES'), ('TRIGGER')) p (privilege)"
+++ " WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND c.relname LIKE ?"
+++ " ), direct_privs AS ("
+++ " SELECT dpo.relname, pn.nspname, dpo.relowner, pr_grantor.rolname AS grantor, dpo.grantee, dpo.privilege_type, dpo.is_grantable"
+++ " FROM direct_privs_oids dpo INNER JOIN roles pr_grantor ON dpo.grantor = pr_grantor.oid"
+++ " INNER JOIN pg_catalog.pg_namespace pn ON pn.oid = dpo.relnamespace"
+++ " WHERE pn.nspname LIKE ?"
+++ " ), memberships(roleid, membership) AS ("
+++ " SELECT pr.oid, 0"
+++ " FROM pg_catalog.pg_roles pr"
+++ " UNION"
+++ " SELECT pr.oid, pr.oid"
+++ " FROM roles pr"
+++ " UNION"
+++ " SELECT m.roleid, pam.roleid"
+++ " FROM roles pr INNER JOIN pg_catalog.pg_auth_members pam ON pr.oid = pam.member"
+++ " INNER JOIN memberships m ON pam.member = m.membership"
+++ " WHERE pr.rolinherit"
+++ " )"
+++ " SELECT current_database() AS TABLE_CAT, dp.nspname AS TABLE_SCHEM, dp.relname AS TABLE_NAME,"
+++ " dp.grantor AS GRANTOR, pr_grantee.rolname AS GRANTEE, dp.privilege_type AS PRIVILEGE,"
+++ " CASE WHEN dp.is_grantable OR (dp.relowner = pr_grantee.oid) THEN 'YES' ELSE 'NO' END AS IS_GRANTABLE"
+++ " FROM direct_privs dp INNER JOIN memberships m ON dp.grantee = m. membership"
+++ " INNER JOIN roles pr_grantee ON pr_grantee.oid = m.roleid"
+++ " ORDER BY dp.nspname, dp.relname, dp.privilege_type"
+++ ));
++
++ Reference< XParameters > parameters( statement, UNO_QUERY_THROW );
-++ parameters->setString( 1 , schemaPattern );
+++ parameters->setString( 3 , schemaPattern );
+++ parameters->setString( 1 , tableNamePattern );
++ parameters->setString( 2 , tableNamePattern );
++
++ Reference< XResultSet > rs = statement->executeQuery();
-++ Reference< XRow > xRow( rs, UNO_QUERY_THROW );
-++ SequenceAnyVector vec;
-++ while( rs->next() )
-++ {
-++ // TODO calculate privileges !
-++ sal_Int32 privilege = 0;
-++ privilege =
-++ PRIVILEGE_SELECT | PRIVILEGE_UPDATE | PRIVILEGE_INSERT |
-++ PRIVILEGE_DELETE | PRIVILEGE_RULE | PRIVILEGE_REFERENCES |
-++ PRIVILEGE_TRIGGER| PRIVILEGE_EXECUTE| PRIVILEGE_USAGE |
-++ PRIVILEGE_CREATE |PRIVILEGE_TEMPORARY;
-++
-++ addPrivilegesToVector( privilege,
-++ m_pSettings->catalog,
-++ xRow->getString( 1 ),
-++ xRow->getString( 2 ),
-++ xRow->getString( 4 ),
-++ m_pSettings->user,
-++ m_pSettings->user == xRow->getString( 4 ),
-++ vec );
-++ }
++
-++ return new SequenceResultSet(
-++ m_refMutex, *this, getStatics().tablePrivilegesNames,
-++ Sequence< Sequence< Any > > ( &vec[0], vec.size() ), m_pSettings->tc );
+++ return rs;
++}
++
++::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier(
@@ -7334,30 +7028,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_databasemetadata.hxx connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+--- connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 2011-09-09 12:00:51.000000000 +0200
-+@@ -0,0 +1,256 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_databasemetadata.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,221 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_databasemetadata.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2003/06/03 21:48:28 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -7372,21 +7047,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -7396,7 +7056,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_DATABASEMETADATA_HXX_
@@ -7594,30 +7253,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_driver.cxx connectivity/source/drivers/postgresql/pq_driver.cxx
+--- connectivity/source/drivers/postgresql/pq_driver.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_driver.cxx 2011-09-09 12:01:12.000000000 +0200
-+@@ -0,0 +1,408 @@
+++++ connectivity/source/drivers/postgresql/pq_driver.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,373 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_driver.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/05/09 19:47:13 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -7632,21 +7272,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -7656,7 +7281,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <stdio.h>
@@ -8006,30 +7630,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_driver.hxx connectivity/source/drivers/postgresql/pq_driver.hxx
+--- connectivity/source/drivers/postgresql/pq_driver.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_driver.hxx 2011-09-09 12:01:12.000000000 +0200
-+@@ -0,0 +1,162 @@
+++++ connectivity/source/drivers/postgresql/pq_driver.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,128 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_driver.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/05/09 19:47:14 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -8044,30 +7649,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#ifndef _PG_DRIVER_HXX_
++#define _PG_DRIVER_HXX_
@@ -8172,8 +7762,35 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+--- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,206 @@
+++++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,233 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * The Initial Developer of the Original Code is: Joerg Budischewski
+++ *
+++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ *
+++ * All Rights Reserved.
+++ *
+++ * Contributor(s): Joerg Budischewski
+++ *
+++ ************************************************************************/
+++
++#include "pq_fakedupdateableresultset.hxx"
++#include <cppuhelper/typeprovider.hxx>
++#include <cppuhelper/queryinterface.hxx>
@@ -8382,29 +7999,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
+--- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,133 @@
+++++ connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,99 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_fakedupdateableresultset.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/05/09 19:47:14 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -8419,21 +8018,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -8442,7 +8026,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#ifndef PG_UPDATEABLERESULTSET_HXX_
++#define PG_UPDATEABLERESULTSET_HXX_
@@ -8519,29 +8102,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.cxx connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+--- connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,883 @@
+++++ connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,854 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_preparedstatement.cxx,v $
-++ *
-++ * $Revision: 1.1.2.10 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2008/07/07 21:37:11 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -8556,30 +8121,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include "pq_preparedstatement.hxx"
@@ -8922,6 +8472,10 @@ index 0000000..1a69913
++ OStringVector::size_type vars = 0;
++ for( OStringVector::size_type i = 0 ; i < m_splittedStatement.size() ; ++i )
++ {
+++ // LEM TODO: instead of this manual mucking with SQL
+++ // could we use PQexecParams / PQExecPrepared / ...?
+++ // Only snafu is giving the types of the parameters and
+++ // that it needs $1, $2, etc instead of "?"
++ const OString &str = m_splittedStatement[i];
++// printf( "Splitted %d %s\n" , i , str.getStr() );
++ if( isQuoted( str ) )
@@ -9406,30 +8960,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_preparedstatement.hxx connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+--- connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 2011-09-09 12:01:05.000000000 +0200
-+@@ -0,0 +1,288 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_preparedstatement.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,253 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_preparedstatement.hxx,v $
-++ *
-++ * $Revision: 1.1.2.5 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:29 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -9444,21 +8979,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -9468,7 +8988,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_PREPARED_STATEMENT_HXX_
@@ -9698,11 +9217,40 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_resultset.cxx connectivity/source/drivers/postgresql/pq_resultset.cxx
+--- connectivity/source/drivers/postgresql/pq_resultset.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_resultset.cxx 2011-09-09 12:00:39.000000000 +0200
-+@@ -0,0 +1,255 @@
+++++ connectivity/source/drivers/postgresql/pq_resultset.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,295 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * The Initial Developer of the Original Code is: Joerg Budischewski
+++ *
+++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ * All Rights Reserved.
+++ *
+++ * Contributor(s): Joerg Budischewski
+++ *
+++ ************************************************************************/
++#include "pq_resultset.hxx"
++#include "pq_resultsetmetadata.hxx"
++
+++#include <com/sun/star/sdbc/FetchDirection.hpp>
+++#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
++#include <com/sun/star/sdbc/ResultSetType.hpp>
++#include <com/sun/star/sdbc/DataType.hpp>
++
@@ -9756,9 +9304,20 @@ index 0000000..1a69913
++ m_table( table ),
++ m_ppSettings( ppSettings )
++{
-++// sal_Bool b = sal_True;
-++// m_props[RESULTSET_IS_BOOKMARKABLE] = Any( &b, getBooleanCppuType() );
-++ m_props[ BASERESULTSET_RESULT_SET_TYPE] = makeAny(
+++ // LEM TODO: shouldn't these things be inherited from the statement or something like that?
+++ sal_Bool b = sal_False;
+++ // Positioned update/delete not supported, so no cursor name
+++ // Fetch direction and size are cursor-specific things, so not used now.
+++ // Fetch size not set
+++ m_props[ BASERESULTSET_FETCH_DIRECTION ] = makeAny(
+++ com::sun::star::sdbc::FetchDirection::UNKNOWN);
+++ // No escape processing for now
+++ m_props[ BASERESULTSET_ESCAPE_PROCESSING ] = Any( &b, getBooleanCppuType() );
+++ // Bookmarks not implemented for now
+++ m_props[ BASERESULTSET_IS_BOOKMARKABLE ] = Any( &b, getBooleanCppuType() );
+++ m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = makeAny(
+++ com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY );
+++ m_props[ BASERESULTSET_RESULT_SET_TYPE ] = makeAny(
++ com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE );
++}
++
@@ -9957,29 +9516,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_resultset.hxx connectivity/source/drivers/postgresql/pq_resultset.hxx
+--- connectivity/source/drivers/postgresql/pq_resultset.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_resultset.hxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,122 @@
+++++ connectivity/source/drivers/postgresql/pq_resultset.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,89 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_resultset.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/05/01 19:19:06 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -9994,29 +9535,14 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
-++ * Copyright: 2000 by Sun Microsystems, Inc.
-++ *
-++ * All Rights Reserved.
+++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
-++ * Contributor(s): Joerg Budischewski
+++ * All Rights Reserved.
++ *
+++ * Contributor(s): Joerg Budischewski
++ *
++ ************************************************************************/
++#ifndef _PG_RESULTSET_HXX_
@@ -10083,30 +9609,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+--- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 2011-09-09 12:00:47.000000000 +0200
-+@@ -0,0 +1,527 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,492 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_resultsetmetadata.cxx,v $
-++ *
-++ * $Revision: 1.1.2.7 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/05/27 11:32:13 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -10121,21 +9628,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -10145,7 +9637,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#include <rtl/ustrbuf.hxx>
++
@@ -10614,30 +10105,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+--- connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,158 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,123 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_resultsetmetadata.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/05/01 19:19:07 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -10652,21 +10124,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -10676,7 +10133,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#ifndef _PQ_RESULTSETMETADATA_HXX_
++#define _PQ_RESULTSETMETADATA_HXX_
@@ -10776,29 +10232,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+--- connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,150 @@
+++++ connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,120 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_sequenceresultset.cxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:31 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -10813,30 +10251,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include "pq_sequenceresultset.hxx"
@@ -10905,7 +10328,10 @@ index 0000000..1a69913
++ // Oh no, not again
++ throw ::com::sun::star::sdbc::SQLException(
++ ASCII_STR( "pq_sequenceresultset: no meta supported " ), *this,
-++ OUString(), 1, Any() );
+++ // I did not find "IM001" in a specific standard,
+++ // but it seems to be used by other systems (such as ODBC)
+++ // and some parts of LibreOffice special-case it.
+++ OUString( ASCII_STR("IM001") ), 1, Any() );
++ }
++ return m_meta;
++}
@@ -10930,29 +10356,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
+--- connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,130 @@
+++++ connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,97 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_sequenceresultset.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:32 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -10967,30 +10375,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#ifndef _PG_SEQUENCERESULTSET_HXX_
++#define _PG_SEQUENCERESULTSET_HXX_
@@ -11064,8 +10457,30 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+--- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,182 @@
+++++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,204 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * Copyright: 200? by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ ************************************************************************/
+++
++#include "pq_sequenceresultsetmetadata.hxx"
++
++#include <rtl/ustrbuf.hxx>
@@ -11250,8 +10665,30 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+--- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 2011-09-09 12:00:01.000000000 +0200
-+@@ -0,0 +1,53 @@
+++++ connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,75 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * Copyright: 200? by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ ************************************************************************/
+++
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
++
@@ -11307,30 +10744,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_statement.cxx connectivity/source/drivers/postgresql/pq_statement.cxx
+--- connectivity/source/drivers/postgresql/pq_statement.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_statement.cxx 2011-09-09 12:00:59.000000000 +0200
-+@@ -0,0 +1,1068 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_statement.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,1033 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_statement.cxx,v $
-++ *
-++ * $Revision: 1.1.2.7 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -11345,21 +10763,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -11369,7 +10772,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#include "pq_statement.hxx"
++#include "pq_fakedupdateableresultset.hxx"
@@ -12379,30 +11781,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_statement.hxx connectivity/source/drivers/postgresql/pq_statement.hxx
+--- connectivity/source/drivers/postgresql/pq_statement.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_statement.hxx 2011-09-09 12:01:05.000000000 +0200
-+@@ -0,0 +1,233 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_statement.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,198 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_statement.hxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:34 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -12417,21 +11800,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -12441,7 +11809,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++#ifndef _PQ_STATEMENT_HXX_
++#define _PQ_STATEMENT_HXX_
@@ -12616,30 +11983,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_statics.cxx connectivity/source/drivers/postgresql/pq_statics.cxx
+--- connectivity/source/drivers/postgresql/pq_statics.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_statics.cxx 2011-09-09 12:00:35.000000000 +0200
-+@@ -0,0 +1,765 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_statics.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,730 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_statics.cxx,v $
-++ *
-++ * $Revision: 1.1.2.6 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/02/15 20:04:48 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -12654,21 +12002,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -12678,7 +12011,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include "pq_statics.hxx"
@@ -13385,29 +12717,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_statics.hxx connectivity/source/drivers/postgresql/pq_statics.hxx
+--- connectivity/source/drivers/postgresql/pq_statics.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_statics.hxx 2011-09-09 12:01:22.000000000 +0200
-+@@ -0,0 +1,296 @@
+++++ connectivity/source/drivers/postgresql/pq_statics.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,263 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_statics.hxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:36 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -13422,21 +12736,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -13685,9 +12984,35 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_tools.cxx connectivity/source/drivers/postgresql/pq_tools.cxx
+--- connectivity/source/drivers/postgresql/pq_tools.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_tools.cxx 2011-09-09 12:01:27.000000000 +0200
-+@@ -0,0 +1,1295 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_tools.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,1321 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * The Initial Developer of the Original Code is: Joerg Budischewski
+++ *
+++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ * All Rights Reserved.
+++ *
+++ * Contributor(s): Joerg Budischewski
+++ *
+++ ************************************************************************/
++
++#include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
@@ -14984,30 +14309,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_tools.hxx connectivity/source/drivers/postgresql/pq_tools.hxx
+--- connectivity/source/drivers/postgresql/pq_tools.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_tools.hxx 2011-09-09 12:01:29.000000000 +0200
-+@@ -0,0 +1,207 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_tools.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,173 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_tools.hxx,v $
-++ *
-++ * $Revision: 1.1.2.7 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2008/07/07 21:37:11 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -15022,21 +14328,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -15195,14 +14486,34 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.cxx connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+--- connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 2011-09-09 12:00:59.000000000 +0200
-+@@ -0,0 +1,557 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-++
-++#include <rtl/ustrbuf.hxx>
-++#include <rtl/strbuf.hxx>
-++
-++#include <cppuhelper/queryinterface.hxx>
+++++ connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,577 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * Copyright: 200? by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ ************************************************************************/
+++
+++#include <rtl/ustrbuf.hxx>
+++#include <rtl/strbuf.hxx>
+++
+++#include <cppuhelper/queryinterface.hxx>
++#include <cppuhelper/typeprovider.hxx>
++
++#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
@@ -15756,13 +15067,36 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_updateableresultset.hxx connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+--- connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 2011-09-09 12:00:35.000000000 +0200
-+@@ -0,0 +1,120 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,162 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++/*************************************************************************
+++ *
+++ * This library is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License version 2.1, as published by the Free Software Foundation.
+++ *
+++ * This library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with this library; if not, write to the Free Software
+++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+++ * MA 02111-1307 USA
+++ *
+++ * Copyright: 200? by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
+++ *
+++ ************************************************************************/
++
++#include "pq_sequenceresultset.hxx"
++#include "pq_resultsetmetadata.hxx"
++
+++#include <com/sun/star/sdbc/FetchDirection.hpp>
+++#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+++#include <com/sun/star/sdbc/ResultSetType.hpp>
++#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
++#include <com/sun/star/sdbc/XRowUpdate.hpp>
++
@@ -15810,6 +15144,25 @@ index 0000000..1a69913
++ m_primaryKey( primaryKey ),
++ m_insertRow( false )
++ {
+++ // LEM TODO: this duplicates code in pq_resultset.cxx, except for different value
+++ // of ResultSetConcurrency. Baaad.
+++ // Why is an updatable ResultSet a sequenceresultset in the first place?
+++ // This seems to imply that the whole data is fetched once and kept in memory. BAAAAD.
+++ // LEM TODO: shouldn't these things be inherited from the statement or something like that?
+++ sal_Bool b = sal_False;
+++ // Positioned update/delete not supported, so no cursor name
+++ // Fetch direction and size are cursor-specific things, so not used now.
+++ // Fetch size not set
+++ m_props[ BASERESULTSET_FETCH_DIRECTION ] = com::sun::star::uno::makeAny(
+++ com::sun::star::sdbc::FetchDirection::UNKNOWN);
+++ // No escape processing for now
+++ m_props[ BASERESULTSET_ESCAPE_PROCESSING ] = com::sun::star::uno::Any( &b, getBooleanCppuType() );
+++ // Bookmarks not implemented for now
+++ m_props[ BASERESULTSET_IS_BOOKMARKABLE ] = com::sun::star::uno::Any( &b, getBooleanCppuType() );
+++ m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = com::sun::star::uno::makeAny(
+++ com::sun::star::sdbc::ResultSetConcurrency::UPDATABLE );
+++ m_props[ BASERESULTSET_RESULT_SET_TYPE ] = com::sun::star::uno::makeAny(
+++ com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE );
++ }
++
++ rtl::OUString buildWhereClause();
@@ -15880,30 +15233,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xbase.cxx connectivity/source/drivers/postgresql/pq_xbase.cxx
+--- connectivity/source/drivers/postgresql/pq_xbase.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xbase.cxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,281 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xbase.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,246 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xbase.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:26:59 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -15918,21 +15252,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -15942,7 +15261,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -16165,30 +15483,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xbase.hxx connectivity/source/drivers/postgresql/pq_xbase.hxx
+--- connectivity/source/drivers/postgresql/pq_xbase.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xbase.hxx 2011-09-09 12:01:05.000000000 +0200
-+@@ -0,0 +1,165 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xbase.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,130 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xbase.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:26:59 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -16203,21 +15502,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -16227,7 +15511,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_REFL_BASE_HXX_
@@ -16334,29 +15617,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.cxx connectivity/source/drivers/postgresql/pq_xcolumn.cxx
+--- connectivity/source/drivers/postgresql/pq_xcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,124 @@
+++++ connectivity/source/drivers/postgresql/pq_xcolumn.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,90 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcolumn.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:26:59 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -16371,21 +15636,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -16394,7 +15644,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <cppuhelper/typeprovider.hxx>
@@ -16462,29 +15711,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xcolumn.hxx connectivity/source/drivers/postgresql/pq_xcolumn.hxx
+--- connectivity/source/drivers/postgresql/pq_xcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,108 @@
+++++ connectivity/source/drivers/postgresql/pq_xcolumn.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,74 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcolumn.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:26:59 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -16499,21 +15730,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -16522,7 +15738,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_COLUMN_HXX_
@@ -16574,30 +15789,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.cxx connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+--- connectivity/source/drivers/postgresql/pq_xcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcolumns.cxx 2011-09-09 12:00:59.000000000 +0200
-+@@ -0,0 +1,618 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xcolumns.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,584 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcolumns.cxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:30 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -16612,30 +15808,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -17196,30 +16377,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xcolumns.hxx connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+--- connectivity/source/drivers/postgresql/pq_xcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcolumns.hxx 2011-09-09 12:00:59.000000000 +0200
-+@@ -0,0 +1,149 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xcolumns.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,114 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcolumns.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:00 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -17234,21 +16396,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -17258,7 +16405,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_COLUMNS_HXX_
@@ -17349,29 +16495,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.cxx connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+--- connectivity/source/drivers/postgresql/pq_xcontainer.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcontainer.cxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,514 @@
+++++ connectivity/source/drivers/postgresql/pq_xcontainer.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,481 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcontainer.cxx,v $
-++ *
-++ * $Revision: 1.1.2.5 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/01/07 13:50:38 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -17386,30 +16514,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -17867,29 +16980,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xcontainer.hxx connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+--- connectivity/source/drivers/postgresql/pq_xcontainer.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xcontainer.hxx 2011-09-09 12:01:22.000000000 +0200
-+@@ -0,0 +1,240 @@
+++++ connectivity/source/drivers/postgresql/pq_xcontainer.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,207 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xcontainer.hxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/01/07 13:50:38 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -17904,21 +16999,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18111,29 +17191,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
+--- connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,122 @@
+++++ connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,88 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexcolumn.cxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:03 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -18148,21 +17210,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18171,7 +17218,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <cppuhelper/typeprovider.hxx>
@@ -18237,29 +17283,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
+--- connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,109 @@
+++++ connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,75 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexcolumn.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:04 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -18274,21 +17302,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18297,7 +17310,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_INDEXCOLUMN_HXX
@@ -18350,30 +17362,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+--- connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,324 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,289 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexcolumns.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:31 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -18388,21 +17381,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18412,7 +17390,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -18678,30 +17655,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
+--- connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 2011-09-09 12:00:37.000000000 +0200
-+@@ -0,0 +1,148 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,113 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexcolumns.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:05 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -18716,21 +17674,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18740,7 +17683,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_INDEXCOLUMNS_HXX
@@ -18830,29 +17772,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xindex.cxx connectivity/source/drivers/postgresql/pq_xindex.cxx
+--- connectivity/source/drivers/postgresql/pq_xindex.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindex.cxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,267 @@
+++++ connectivity/source/drivers/postgresql/pq_xindex.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,233 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindex.cxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:01 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -18867,21 +17791,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -18890,7 +17799,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -19101,30 +18009,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xindexes.cxx connectivity/source/drivers/postgresql/pq_xindexes.cxx
+--- connectivity/source/drivers/postgresql/pq_xindexes.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexes.cxx 2011-09-09 12:00:59.000000000 +0200
-+@@ -0,0 +1,355 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xindexes.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,321 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexes.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:31 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -19139,30 +18028,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -19460,29 +18334,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xindexes.hxx connectivity/source/drivers/postgresql/pq_xindexes.hxx
+--- connectivity/source/drivers/postgresql/pq_xindexes.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindexes.hxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,135 @@
+++++ connectivity/source/drivers/postgresql/pq_xindexes.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,102 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindexes.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:07 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -19497,30 +18353,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_INDEXES_HXX_
@@ -19599,29 +18440,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xindex.hxx connectivity/source/drivers/postgresql/pq_xindex.hxx
+--- connectivity/source/drivers/postgresql/pq_xindex.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xindex.hxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,156 @@
+++++ connectivity/source/drivers/postgresql/pq_xindex.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,122 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xindex.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:02 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -19636,21 +18459,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -19659,7 +18467,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_XINDEX_HXX
@@ -19759,29 +18566,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
+--- connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,121 @@
+++++ connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,87 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeycolumn.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:08 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -19796,21 +18585,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -19819,7 +18593,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <cppuhelper/typeprovider.hxx>
@@ -19884,29 +18657,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
+--- connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,108 @@
+++++ connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,74 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeycolumn.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:09 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -19921,21 +18676,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -19944,7 +18684,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_KEYCOLUMN_HXX
@@ -19996,29 +18735,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+--- connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,411 @@
+++++ connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,377 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeycolumns.cxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:31 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -20033,21 +18754,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -20056,7 +18762,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -20411,29 +19116,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
+--- connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,134 @@
+++++ connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,100 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeycolumns.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:09 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -20448,21 +19135,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -20471,7 +19143,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_KEYCOLUMNS_HXX
@@ -20549,29 +19220,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xkey.cxx connectivity/source/drivers/postgresql/pq_xkey.cxx
+--- connectivity/source/drivers/postgresql/pq_xkey.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkey.cxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,262 @@
+++++ connectivity/source/drivers/postgresql/pq_xkey.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,228 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkey.cxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:07 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -20586,21 +19239,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -20609,7 +19247,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -20815,29 +19452,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xkey.hxx connectivity/source/drivers/postgresql/pq_xkey.hxx
+--- connectivity/source/drivers/postgresql/pq_xkey.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkey.hxx 2011-09-09 12:00:02.000000000 +0200
-+@@ -0,0 +1,152 @@
+++++ connectivity/source/drivers/postgresql/pq_xkey.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,118 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkey.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:08 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -20852,21 +19471,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -20875,7 +19479,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_KEY_HXX_
@@ -20971,30 +19574,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xkeys.cxx connectivity/source/drivers/postgresql/pq_xkeys.cxx
+--- connectivity/source/drivers/postgresql/pq_xkeys.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeys.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,388 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xkeys.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,353 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeys.cxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/08/29 08:33:32 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -21009,21 +19593,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -21033,7 +19602,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -21363,29 +19931,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xkeys.hxx connectivity/source/drivers/postgresql/pq_xkeys.hxx
+--- connectivity/source/drivers/postgresql/pq_xkeys.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xkeys.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,134 @@
+++++ connectivity/source/drivers/postgresql/pq_xkeys.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,101 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xkeys.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:10 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -21400,30 +19950,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_KEYS_HXX_
@@ -21501,30 +20036,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xtable.cxx connectivity/source/drivers/postgresql/pq_xtable.cxx
+--- connectivity/source/drivers/postgresql/pq_xtable.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xtable.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,485 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xtable.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,451 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xtable.cxx,v $
-++ *
-++ * $Revision: 1.1.2.6 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/01/07 13:50:38 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -21539,30 +20055,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -21990,29 +20491,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xtable.hxx connectivity/source/drivers/postgresql/pq_xtable.hxx
+--- connectivity/source/drivers/postgresql/pq_xtable.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xtable.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,220 @@
+++++ connectivity/source/drivers/postgresql/pq_xtable.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,187 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xtable.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:10 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -22027,30 +20510,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_TABLE_HXX_
@@ -22214,30 +20682,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xtables.cxx connectivity/source/drivers/postgresql/pq_xtables.cxx
+--- connectivity/source/drivers/postgresql/pq_xtables.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xtables.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,464 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xtables.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,429 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xtables.cxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/05/01 19:19:08 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -22252,21 +20701,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -22276,7 +20710,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -22682,29 +21115,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xtables.hxx connectivity/source/drivers/postgresql/pq_xtables.hxx
+--- connectivity/source/drivers/postgresql/pq_xtables.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xtables.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,118 @@
+++++ connectivity/source/drivers/postgresql/pq_xtables.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,85 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xtables.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:11 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -22719,30 +21134,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_TABLES_HXX_
@@ -22804,30 +21204,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xuser.cxx connectivity/source/drivers/postgresql/pq_xuser.cxx
+--- connectivity/source/drivers/postgresql/pq_xuser.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xuser.cxx 2011-09-09 12:01:18.000000000 +0200
-+@@ -0,0 +1,258 @@
+++++ connectivity/source/drivers/postgresql/pq_xuser.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,224 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xuser.cxx,v $
-++ *
-++ * $Revision: 1.1.2.3 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:40 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -22842,30 +21223,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -23066,30 +21432,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xuser.hxx connectivity/source/drivers/postgresql/pq_xuser.hxx
+--- connectivity/source/drivers/postgresql/pq_xuser.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xuser.hxx 2011-09-09 12:01:18.000000000 +0200
-+@@ -0,0 +1,133 @@
+++++ connectivity/source/drivers/postgresql/pq_xuser.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,99 @@
++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xuser.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:12 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -23104,30 +21451,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_USER_HXX_
@@ -23203,30 +21535,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xusers.cxx connectivity/source/drivers/postgresql/pq_xusers.cxx
+--- connectivity/source/drivers/postgresql/pq_xusers.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xusers.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,256 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+++++ connectivity/source/drivers/postgresql/pq_xusers.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,221 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xusers.cxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/01/22 15:14:41 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -23241,21 +21554,6 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
@@ -23265,7 +21563,6 @@ index 0000000..1a69913
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -23463,29 +21760,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xusers.hxx connectivity/source/drivers/postgresql/pq_xusers.hxx
+--- connectivity/source/drivers/postgresql/pq_xusers.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xusers.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,116 @@
+++++ connectivity/source/drivers/postgresql/pq_xusers.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,83 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xusers.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/05/09 19:47:25 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -23500,30 +21779,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef HEADER_PQ_USERS_HXX_
@@ -23583,29 +21847,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xview.cxx connectivity/source/drivers/postgresql/pq_xview.cxx
+--- connectivity/source/drivers/postgresql/pq_xview.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xview.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,285 @@
+++++ connectivity/source/drivers/postgresql/pq_xview.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,252 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xview.cxx,v $
-++ *
-++ * $Revision: 1.1.2.5 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2007/01/07 13:50:38 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -23620,30 +21866,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <rtl/ustrbuf.hxx>
@@ -23872,29 +22103,11 @@ index 0000000..1a69913
++}
+diff -urN connectivity/source/drivers/postgresql/pq_xview.hxx connectivity/source/drivers/postgresql/pq_xview.hxx
+--- connectivity/source/drivers/postgresql/pq_xview.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xview.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,133 @@
+++++ connectivity/source/drivers/postgresql/pq_xview.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,100 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xview.hxx,v $
-++ *
-++ * $Revision: 1.1.2.2 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/06/10 15:27:13 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -23909,30 +22122,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef PQ_XVIEW_HXX
@@ -24009,29 +22207,11 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/source/drivers/postgresql/pq_xviews.cxx connectivity/source/drivers/postgresql/pq_xviews.cxx
+--- connectivity/source/drivers/postgresql/pq_xviews.cxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xviews.cxx 2011-09-09 12:01:00.000000000 +0200
-+@@ -0,0 +1,304 @@
+++++ connectivity/source/drivers/postgresql/pq_xviews.cxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,271 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xviews.cxx,v $
-++ *
-++ * $Revision: 1.1.2.4 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2006/05/01 19:19:09 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -24046,30 +22226,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#include <vector>
@@ -24317,29 +22482,11 @@ index 0000000..1a69913
++};
+diff -urN connectivity/source/drivers/postgresql/pq_xviews.hxx connectivity/source/drivers/postgresql/pq_xviews.hxx
+--- connectivity/source/drivers/postgresql/pq_xviews.hxx 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/source/drivers/postgresql/pq_xviews.hxx 2011-09-09 12:00:03.000000000 +0200
-+@@ -0,0 +1,118 @@
+++++ connectivity/source/drivers/postgresql/pq_xviews.hxx 2011-10-16 17:28:43.000000000 +0200
++@@ -0,0 +1,85 @@
+++/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*************************************************************************
++ *
-++ * $RCSfile: pq_xviews.hxx,v $
-++ *
-++ * $Revision: 1.1.2.1 $
-++ *
-++ * last change: $Author: jbu $ $Date: 2004/05/09 19:47:26 $
-++ *
-++ * The Contents of this file are made available subject to the terms of
-++ * either of the following licenses
-++ *
-++ * - GNU Lesser General Public License Version 2.1
-++ * - Sun Industry Standards Source License Version 1.1
-++ *
-++ * Sun Microsystems Inc., October, 2000
-++ *
-++ * GNU Lesser General Public License Version 2.1
-++ * =============================================
-++ * Copyright 2000 by Sun Microsystems, Inc.
-++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
@@ -24354,30 +22501,15 @@ index 0000000..1a69913
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
-++ *
-++ * Sun Industry Standards Source License Version 1.1
-++ * =================================================
-++ * The contents of this file are subject to the Sun Industry Standards
-++ * Source License Version 1.1 (the "License"); You may not use this file
-++ * except in compliance with the License. You may obtain a copy of the
-++ * License at http://www.openoffice.org/license.html.
-++ *
-++ * Software provided under this License is provided on an "AS IS" basis,
-++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-++ * See the License for the specific provisions governing your rights and
-++ * obligations concerning the Software.
-++ *
++ * The Initial Developer of the Original Code is: Joerg Budischewski
++ *
++ * Copyright: 2000 by Sun Microsystems, Inc.
+++ * 2011 by Lionel Elie Mamane <lionel@mamane.lu>
++ *
++ * All Rights Reserved.
++ *
++ * Contributor(s): Joerg Budischewski
++ *
-++ *
++ ************************************************************************/
++
++#ifndef _PQ_VIEWS_HXX_
@@ -24439,7 +22571,7 @@ index 0000000..1a69913
++#endif
+diff -urN connectivity/workben/postgresql/ddl.py connectivity/workben/postgresql/ddl.py
+--- connectivity/workben/postgresql/ddl.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/ddl.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/ddl.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,185 @@
++#*************************************************************************
++#
@@ -24628,7 +22760,7 @@ index 0000000..1a69913
++ stmt.close()
+diff -urN connectivity/workben/postgresql/main.py connectivity/workben/postgresql/main.py
+--- connectivity/workben/postgresql/main.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/main.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/main.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,90 @@
++#*************************************************************************
++#
@@ -24722,7 +22854,7 @@ index 0000000..1a69913
++runner.run(suite)
+diff -urN connectivity/workben/postgresql/makefile.mk connectivity/workben/postgresql/makefile.mk
+--- connectivity/workben/postgresql/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/makefile.mk 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/makefile.mk 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,103 @@
++#*************************************************************************
++#
@@ -24829,7 +22961,7 @@ index 0000000..1a69913
++ +cd $(DLLDEST) && python main.py "$(dburl)"
+diff -urN connectivity/workben/postgresql/metadata.py connectivity/workben/postgresql/metadata.py
+--- connectivity/workben/postgresql/metadata.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/metadata.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/metadata.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,151 @@
++#*************************************************************************
++#
@@ -24984,7 +23116,7 @@ index 0000000..1a69913
++# print rs.getString( 1 )
+diff -urN connectivity/workben/postgresql/preparedstatement.py connectivity/workben/postgresql/preparedstatement.py
+--- connectivity/workben/postgresql/preparedstatement.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/preparedstatement.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/preparedstatement.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,228 @@
++#*************************************************************************
++#
@@ -25216,7 +23348,7 @@ index 0000000..1a69913
++ self.failUnless( rs.getString(1) == "foo''l" )
+diff -urN connectivity/workben/postgresql/sdbcx.py connectivity/workben/postgresql/sdbcx.py
+--- connectivity/workben/postgresql/sdbcx.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/sdbcx.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/sdbcx.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,306 @@
++#*************************************************************************
++#
@@ -25526,7 +23658,7 @@ index 0000000..1a69913
++ self.failUnless( "pqsdbc_joe" in users.getElementNames() )
+diff -urN connectivity/workben/postgresql/statement.py connectivity/workben/postgresql/statement.py
+--- connectivity/workben/postgresql/statement.py 1970-01-01 01:00:00.000000000 +0100
-++++ connectivity/workben/postgresql/statement.py 2011-09-09 12:00:08.000000000 +0200
+++++ connectivity/workben/postgresql/statement.py 2011-10-16 17:28:41.000000000 +0200
+@@ -0,0 +1,277 @@
++#*************************************************************************
++#
@@ -25805,6 +23937,47 @@ index 0000000..1a69913
++ self.failUnless( data[0] == myarray[0] )
++ self.failUnless( data[1] == myarray[1] )
++ self.failUnless( data[2] == myarray[2] )
++diff -urN svx/source/fmcomp/fmgridif.cxx svx/source/fmcomp/fmgridif.cxx
++--- svx/source/fmcomp/fmgridif.cxx 2011-10-16 17:11:55.000000000 +0200
+++++ svx/source/fmcomp/fmgridif.cxx 2011-10-16 17:28:40.000000000 +0200
++@@ -2090,7 +2090,6 @@
++ {
++ sal_Bool bValue( sal_True );
++ OSL_VERIFY( Value >>= bValue );
++- pGrid->EnableHandle( bValue );
++
++ // Im DesignModus nur das Datenfenster disablen
++ // Sonst kann das Control nicht mehr konfiguriert werden
++@@ -2442,6 +2441,9 @@
++ // get the list position
++ sal_uInt16 nPos = pGrid->GetModelColumnPos(nId);
++
+++ if ( nPos == GRID_COLUMN_NOT_FOUND )
+++ return aElement;
+++
++ DbGridColumn* pCol = pGrid->GetColumns().at( nPos );
++ Reference< ::com::sun::star::awt::XControl > xControl(pCol->GetCell());
++ aElement <<= xControl;
++diff -urN svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/gridctrl.cxx
++--- svx/source/fmcomp/gridctrl.cxx 2011-10-16 17:11:55.000000000 +0200
+++++ svx/source/fmcomp/gridctrl.cxx 2011-10-16 17:28:40.000000000 +0200
++@@ -1723,11 +1723,12 @@
++ void DbGridControl::RemoveColumn(sal_uInt16 nId)
++ {
++ sal_uInt16 nIndex = GetModelColumnPos(nId);
++- if (nIndex == GRID_COLUMN_NOT_FOUND)
++- return;
++
++ DbGridControl_Base::RemoveColumn(nId);
++
+++ if (nIndex == GRID_COLUMN_NOT_FOUND)
+++ return;
+++
++ delete m_aColumns[ nIndex ];
++ DbGridColumns::iterator it = m_aColumns.begin();
++ ::std::advance( it, nIndex );
+--- /dev/null
++++ libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff
diff --git libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-oxt.diff libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-oxt.diff
deleted file mode 100644
index 85c174a..0000000
--
LibreOffice packaging repository
Reply to: