dba33d: merge

1 files changed, 2 insertions, 11 deletions

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 5ac373b80ded..3cdfe9da3433 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -597,13 +597,8 @@ public class DBMetaData
 
     public void getDataSourceInterfaces() throws Exception
     {
-<<<<<<< local
-        xCompleted = UnoRuntime.queryInterface( XCompletedConnection.class, m_dataSource );
-        xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource );
-=======
-        xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, getDataSource());
-        xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, getDataSource());
->>>>>>> other
+        xCompleted = UnoRuntime.queryInterface(XCompletedConnection.class, getDataSource());
+        xDataSourcePropertySet = UnoRuntime.queryInterface(XPropertySet.class, getDataSource());
         bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
     }
 
@@ -686,11 +681,7 @@ public class DBMetaData
     private boolean getConnection(String _DataSourceName)
     {
         setDataSourceByName(_DataSourceName, true);
-<<<<<<< local
-        return getConnection(m_dataSource);
-=======
         return getConnection( getDataSource() );
->>>>>>> other
     }
 
     private boolean getConnection(com.sun.star.sdbc.XConnection _DBConnection)