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

[René Engelhard]

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

New commits:
commit 6feb90398c1e18eb4951af3c1be4f4d4c8e6861a
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 7 20:24:05 2010 +0100

    Revert "backport fix for (table) database wizards", needs method not in 3.1.1
    
    This reverts commit 68c071fd1a3975cd7463723e4334c6ea1d345c48.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5113ccf..4d7fe70 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -455,8 +455,6 @@ libxmlsec-findcerts.diff, i#76870, pmladek
 # avoid error messages about missing directories with templates
 sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 
-i107917.diff, i#107917
-
 [ FedoraLinuxOnlyFixes ]
 # fix for new SQLLEN in unixodbc. Update internal headers.
 new-SQLLEN.diff, i#104088
diff --git a/patches/dev300/i107917.diff b/patches/dev300/i107917.diff
deleted file mode 100644
index 50b9ceb..0000000
--- a/patches/dev300/i107917.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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();
-     }
-