git subrepo pull (merge) uno

subrepo:
  subdir:   "uno"
  merged:   "70309ec"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "c78d66c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Author: prrvchr

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = cc2e4df5937d42ddb0ead746bf717c04842a51a4
+	commit = c78d66c312c9eda89004b4c73d15db42539910fe
 	parent = 97f32810cd78f580a2f3498ff27c564246037184
 	method = merge
 	cmdver = 0.4.3

uno/lib/java/helper/UnoHelper.java

@@ -32,7 +32,6 @@
 import com.sun.star.resource.XStringResourceResolver;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XRow;
-import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.RuntimeException;
@@ -366,19 +365,19 @@ public static WrappedTargetException getWrappedException(Exception e)
         return exception;
     }
 
-    public static java.sql.SQLException getSQLException(java.lang.Exception e)
+    public static java.sql.SQLException getSQLException(java.lang.Throwable e)
     {
-        return new java.sql.SQLException(e.getMessage(), e);
+        return new java.sql.SQLException(e.getLocalizedMessage(), e);
     }
 
     public static SQLException getSQLException(java.sql.SQLException e)
     {
-        return new SQLException(e.getMessage());
+        return getUnoSQLException(e.getLocalizedMessage());
     }
 
     public static SQLException getSQLException(Exception e, XInterface component)
     {
-        SQLException exception = new SQLException(e.getMessage());
+        SQLException exception = getUnoSQLException(e.getMessage());
         exception.Context = component;
         return exception;
     }
@@ -387,25 +386,36 @@ public static SQLException getSQLException(java.sql.SQLException e, XInterface c
     {
         SQLException exception = null;
         if (e != null) {
-            exception = new SQLException(e.getMessage());
+            exception = getUnoSQLException(e.getLocalizedMessage());
             exception.Context = component;
-            exception.SQLState = e.getSQLState();
+            String state = e.getSQLState();
+            if (state != null) {
+                exception.SQLState = state;
+            }
             exception.ErrorCode = e.getErrorCode();
             SQLException ex = getNextSQLException(e.getNextException(), component);
-            exception.NextException = (ex == null) ? Any.VOID : ex;
+            if (ex != null) {
+                exception.NextException = ex;
+            }
         }
         return exception;
     }
 
+    private static SQLException getUnoSQLException(String msg)
+    {
+        return msg != null ? new SQLException(msg) : new SQLException();
+    }
+
     public static SQLException getSQLException(java.lang.Exception e,
                                                XInterface component)
     {
-        SQLException exception = new SQLException(e.getMessage());
+        SQLException exception = getUnoSQLException(e.getMessage());
         exception.Context = component;
         return exception;
     }
 
-    private static SQLException getNextSQLException(java.sql.SQLException e, XInterface component)
+    private static SQLException getNextSQLException(java.sql.SQLException e,
+                                                    XInterface component)
     {
         SQLException exception = null;
         if (e != null) {