git subrepo pull (merge) uno

subrepo: subdir: "uno" merged: "c1e5980" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "c1e5980" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
prrvchr · Feb 4, 2024 · 808364d · 808364d
1 parent 28f6b6d
commit 808364d
Show file tree

Hide file tree

Showing 100 changed files with 1,154 additions and 6,865 deletions.
diff --git a/uno/.gitrepo b/uno/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 69a936c0d82e601a180a35d543b6a900847dc445
-	parent = 86172ea4e15357057b14d2162834b735ede02328
+	commit = c1e5980fe4f73a0a4805d32326812d0736dbb471
+	parent = 28f6b6d3b05929805c0be924321fbc5922afe084
 	method = merge
 	cmdver = 0.4.3
diff --git a/uno/dialog/grid/GridWindow.xdl b/uno/dialog/grid/GridWindow.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/dialog/logger/LogDialog.xdl b/uno/dialog/logger/LogDialog.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/dialog/logger/LogWindow.xdl b/uno/dialog/logger/LogWindow.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/beans/PropertySet.java b/uno/lib/java/beans/PropertySet.java
@@ -21,7 +21,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/beans/PropertySetAdapter.java b/uno/lib/java/beans/PropertySetAdapter.java
@@ -21,7 +21,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/helper/Array.java b/uno/lib/java/helper/Array.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/helper/EventLogger.java b/uno/lib/java/helper/EventLogger.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
@@ -293,16 +293,22 @@ public boolean logp(int level,
     }
 
     protected boolean _log(int level,
-                               String clazz,
-                               String method,
-                               String message,
-                               Object... arguments)
+                           String clazz,
+                           String method,
+                           String message,
+                           Object... arguments)
     {
         if (m_xLogger == null) {
             return false;
         }
         if (arguments.length > 0) {
-            message = String.format(message, arguments);
+            try {
+                message = String.format(message, arguments);
+            }
+            catch (java.lang.Exception e){
+                System.out.println("EventLogger._log ERROR" + message);
+                // pass
+            }
         }
         if (clazz != null && method != null) {
             m_xLogger.logp(level, clazz, method, message);

diff --git a/uno/lib/java/helper/OfficeResourceBundle.java b/uno/lib/java/helper/OfficeResourceBundle.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/helper/RegistrationHelper.java b/uno/lib/java/helper/RegistrationHelper.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/helper/ResourceBasedEventLogger.java b/uno/lib/java/helper/ResourceBasedEventLogger.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
@@ -84,35 +84,55 @@ public ResourceBasedEventLogger(XComponentContext context,
             throw new RuntimeException(e);
         }
     }
-    
+
     /**
-     * Logs a given resource id with its arguments, without the caller's class and method.
+     * Logs a given message, without the caller's class and method.
      * @param level the log level
-     * @param id the resource ID of the message to log
-     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @param message the message to log
      * @return whether logging succeeded
      */
     public boolean log(int level,
-                       int id,
-                       Object... arguments)
+                       String message)
     {
         if (isLoggable(level)) {
-            return _log(level, null, null, loadStringMessage(id), arguments);
+            return _log(level, null, null, message);
         }
         return false;
     }
 
     /**
-     * Logs a given message, without the caller's class and method.
+     * Logs a given message with its arguments, with the caller's class and method
+     * taken from a (relatively costly!) stack trace.
      * @param level the log level
+     * @param class name who log this message
+     * @param method name who log this message
      * @param message the message to log
      * @return whether logging succeeded
      */
-    public boolean log(int level,
-                       String message)
+    public boolean logp(int level,
+                        String cls,
+                        String method,
+                        String message)
     {
         if (isLoggable(level)) {
-            return _log(level, null, null, message);
+            return _log(level, cls, method, message);
+        }
+        return false;
+    }
+
+    /**
+     * Logs a given resource bundle id with its arguments, without the caller's class and method.
+     * @param level the log level
+     * @param id the resource ID of the message to log
+     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @return whether logging succeeded
+     */
+    public boolean logrb(int level,
+                         int id,
+                         Object... arguments)
+    {
+        if (isLoggable(level)) {
+            return _log(level, null, null, loadStringMessage(id), arguments);
         }
         return false;
     }
@@ -125,7 +145,7 @@ public boolean log(int level,
      * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
      * @return whether logging succeeded
      */
-    public boolean logp(int level,
+    public boolean logprb(int level,
                         int id,
                         Object... arguments)
     {
@@ -136,27 +156,64 @@ public boolean logp(int level,
         return false;
     }
 
-    protected boolean logp(int level,
-                           StackTraceElement caller,
-                           int id,
-                           Object... arguments)
+
+    /**
+     * Logs a given message with its arguments, with the caller's class and method
+     * taken from a (relatively costly!) stack trace.
+     * @param level the log level
+     * @param class name who log this message
+     * @param method name who log this message
+     * @param id the resource string id to log
+     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @return whether logging succeeded
+     */
+    public boolean logprb(int level,
+                          String cls,
+                          String method,
+                          int id,
+                          Object...arguments)
+    {
+        if (isLoggable(level)) {
+            return _log(level, cls, method, loadStringMessage(id), arguments);
+        }
+        return false;
+    }
+
+    protected boolean logprb(int level,
+                             StackTraceElement caller,
+                             int id,
+                             Object... arguments)
     {
         if (isLoggable(level)) {
             return _log(level, caller.getClassName(), caller.getMethodName(), loadStringMessage(id), arguments);
         }
         return false;
     }
 
+    public String getStringResource(int id, Object... arguments)
+    {
+        String message = loadStringMessage(id);
+        if (arguments.length > 0) {
+            try {
+                message = String.format(message, arguments);
+            }
+            catch (java.lang.Exception e) {
+                // pass
+            }
+        }
+        return message;
+    }
+
     private String loadStringMessage(int id)
     {
         String message;
         try {
             message = m_Bundle.loadString(id);
         }
         catch (MissingResourceException | Exception e) {
-            StringWriter error = new StringWriter();
-            e.printStackTrace(new PrintWriter(error));
-            message = String.format("<invalid event resource: '%s:%d'>\n%s", m_basename, id, error.getBuffer().toString());
+            StringWriter writer = new StringWriter();
+            e.printStackTrace(new PrintWriter(writer));
+            message = String.format("<invalid event resource: '%s:%d'>\n%s", m_basename, id, writer.getBuffer().toString());
         }
         return message;
     }

diff --git a/uno/lib/java/helper/SharedResources.java b/uno/lib/java/helper/SharedResources.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/java/lang/ServiceInfo.java b/uno/lib/java/lang/ServiceInfo.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║

diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/LICENSE b/uno/lib/python/dateutil-2.8.2.dist-info/LICENSE
@@ -0,0 +1,54 @@
+Copyright 2017- Paul Ganssle <[email protected]>
+Copyright 2017- dateutil contributors (see AUTHORS file)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+The above license applies to all contributions after 2017-12-01, as well as
+all contributions that have been re-licensed (see AUTHORS file for the list of
+contributors who have re-licensed their code).
+--------------------------------------------------------------------------------
+dateutil - Extensions to the standard Python datetime module.
+
+Copyright (c) 2003-2011 - Gustavo Niemeyer <[email protected]>
+Copyright (c) 2012-2014 - Tomi Pieviläinen <[email protected]>
+Copyright (c) 2014-2016 - Yaron de Leeuw <[email protected]>
+Copyright (c) 2015-     - Paul Ganssle <[email protected]>
+Copyright (c) 2015-     - dateutil contributors (see AUTHORS file)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The above BSD License Applies to all code, even that also covered by Apache 2.0.