You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2026/09/22 18:43:39 UTC
(openoffice) branch trunk updated (6fe7ee9387 -> 6c6152cef7)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 6fe7ee9387 Returns empty values instead of null from JavaSQLResultSet.getBytes() and JavaSQLResultSet.getDate(), when the database field is NULL.
new 7826359d22 java.lang.Boolean can't be cast to com.sun.star.uno.Any. In Java, UNO's "Any" is java.lang.Object.
new 6c6152cef7 Read the catalog and schema from the new table object, not the table descriptor used to create it. This avoids an exception when the table descriptor's CatalogName property returns VOID instead of a string.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/wizards/com/sun/star/wizards/db/DBMetaData.java | 3 +--
main/wizards/com/sun/star/wizards/db/TableDescriptor.java | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
(openoffice) 01/02: java.lang.Boolean can't be cast to com.sun.star.uno.Any. In Java, UNO's "Any" is java.lang.Object.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7826359d221fc59714335fac155fb85bfeea0326
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Tue Sep 22 20:42:14 2026 +0200
java.lang.Boolean can't be cast to com.sun.star.uno.Any.
In Java, UNO's "Any" is java.lang.Object.
Patch by: me
---
main/wizards/com/sun/star/wizards/db/DBMetaData.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/main/wizards/com/sun/star/wizards/db/DBMetaData.java b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
index 4f0ecd46e9..b982615d10 100644
--- a/main/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -77,7 +77,6 @@ import com.sun.star.wizards.common.NumberFormatter;
import com.sun.star.wizards.common.Properties;
import com.sun.star.wizards.common.Resource;
import com.sun.star.wizards.common.SystemDialog;
-import com.sun.star.uno.Any;
import com.sun.star.wizards.common.PropertyNames;
import java.util.Vector;
import java.util.logging.Level;
@@ -783,7 +782,7 @@ public class DBMetaData
try
{
ensureDataSourceSettings();
- Any primaryKeySupport = (Any)m_dataSourceSettings.getPropertyValue( "PrimaryKeySupport" );
+ Object primaryKeySupport = m_dataSourceSettings.getPropertyValue( "PrimaryKeySupport" );
if ( AnyConverter.isVoid( primaryKeySupport ) )
supportsPrimaryKeys = supportsCoreSQLGrammar();
else
(openoffice) 02/02: Read the catalog and schema from the new table object, not the table descriptor used to create it. This avoids an exception when the table descriptor's CatalogName property returns VOID instead of a string.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6c6152cef718882dd13b1f34cd72a257d7ce94ca
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Tue Sep 22 20:42:55 2026 +0200
Read the catalog and schema from the new table object, not the table
descriptor used to create it. This avoids an exception when the
table descriptor's CatalogName property returns VOID instead of
a string.
Patch by: me
---
main/wizards/com/sun/star/wizards/db/TableDescriptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/wizards/com/sun/star/wizards/db/TableDescriptor.java b/main/wizards/com/sun/star/wizards/db/TableDescriptor.java
index d2262f7f6b..641b5f7a92 100644
--- a/main/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/main/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -775,8 +775,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
{
XPropertySet xTablePropertySet = UnoRuntime.queryInterface(XPropertySet.class, arg0.Element);
String stablename = AnyConverter.toString(xTablePropertySet.getPropertyValue(PropertyNames.PROPERTY_NAME));
- String sschemaname = AnyConverter.toString(xPropTableDataDescriptor.getPropertyValue("SchemaName"));
- String scatalogname = AnyConverter.toString(xPropTableDataDescriptor.getPropertyValue("CatalogName"));
+ String sschemaname = AnyConverter.toString(xTablePropertySet.getPropertyValue("SchemaName"));
+ String scatalogname = AnyConverter.toString(xTablePropertySet.getPropertyValue("CatalogName"));
ComposedTableName = new CommandName(this, scatalogname, sschemaname, stablename, false);
appendTableNameToFilter(ComposedTableName.getComposedName());
}