[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[René Engelhard]

 patches/dev300/apply        |    2 ++
 patches/dev300/i107917.diff |   25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

New commits:
commit 42c0c66d3cd8992c8833d8347493f599b1e41a0d
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 4 20:45:23 2010 +0100

    backport fix for (table) database wizards
    
    * patches/dev300/i107917.diff: fix for issue 107917
    * patches/dev300/apply: add

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 93200bb..216d217 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -470,6 +470,8 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
 
+i107917.diff, i#107917
+
 [ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
diff --git a/patches/dev300/i107917.diff b/patches/dev300/i107917.diff
new file mode 100644
index 0000000..50b9ceb
--- /dev/null
+++ b/patches/dev300/i107917.diff
@@ -0,0 +1,25 @@
+Author: fs
+Date: Mon Jan  4 12:56:14 2010
+New Revision: 277843
+
+Log:
+#i107917# do not access xDataSource for reading, but use getDataSource()
+
+Modified:
+   cws/dba32k/wizards/com/sun/star/wizards/db/DBMetaData.java
+
+Modified: cws/dba32k/wizards/com/sun/star/wizards/db/DBMetaData.java
+==============================================================================
+--- wizards/com/sun/star/wizards/db/DBMetaData.java	Mon Jan  4 12:36:09 2010	(r277842)
++++ wizards/com/sun/star/wizards/db/DBMetaData.java	Mon Jan  4 12:56:14 2010	(r277843)
+@@ -599,8 +599,8 @@
+ 
+     public void getDataSourceInterfaces() throws Exception
+     {
+-        xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, xDataSource);
+-        xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDataSource);
++        xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, getDataSource());
++        xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, getDataSource());
+         bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
+     }
+