diff options
| -rw-r--r-- | qadevOOo/runner/util/db/DataSource.java | 2 | ||||
| -rw-r--r-- | qadevOOo/runner/util/db/DataSourceDescriptor.java | 4 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index 0918ba1d14e6..9b1ac806ff4c 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -42,7 +42,7 @@ public class DataSource m_dataSource ); Object[] descriptorProperties = new Object[] { - _descriptor.Name, _descriptor.URL, _descriptor.Info, _descriptor.User, _descriptor.Password, + null, _descriptor.URL, _descriptor.Info, _descriptor.User, _descriptor.Password, _descriptor.IsPasswordRequired }; String[] propertyNames = new String[] { "Name", "URL", "Info", "User", "Password", "IsPasswordRequired" }; diff --git a/qadevOOo/runner/util/db/DataSourceDescriptor.java b/qadevOOo/runner/util/db/DataSourceDescriptor.java index f4de986eab7c..6b699445f18b 100644 --- a/qadevOOo/runner/util/db/DataSourceDescriptor.java +++ b/qadevOOo/runner/util/db/DataSourceDescriptor.java @@ -26,10 +26,6 @@ import com.sun.star.lang.XMultiServiceFactory; public class DataSourceDescriptor { /** - * Representation of <code>'Name'</code> property. - */ - public String Name = null ; - /** * Representation of <code>'URL'</code> property. */ public String URL = null ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 2cb340ed3182..a22333bb012c 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -251,7 +251,7 @@ public class ORowSet extends TestCase { if (isMySQLDB) { DBTools.DataSourceInfo legacyDescriptor = dbTools.newDataSourceInfo(); - legacyDescriptor.Name = srcInf.Name; + legacyDescriptor.Name = null; legacyDescriptor.User = srcInf.User; legacyDescriptor.Password = srcInf.Password; legacyDescriptor.Info = srcInf.Info; |