new version 1.2.0

Author: prrvchr

README.md

@@ -158,7 +158,7 @@ ___
 Normally, the extension is created with Eclipse for Java and [LOEclipse][41]. To work around Eclipse, I modified LOEclipse to allow the extension to be created with Apache Ant.  
 To create the HyperSQLOOo extension with the help of Apache Ant, you need to:
 - Install the [Java SDK][42] version 8 or higher.
-- Install [Apache Ant][43] version 1.9.1 or higher.
+- Install [Apache Ant][43] version 1.10.0 or higher.
 - Install [LibreOffice and its SDK][44] version 7.x or higher.
 - Clone the [HyperSQLOOo][45] repository on GitHub into a folder.
 - From this folder, move to the directory: `source/HyperSQLOOo/`

README_fr.md

@@ -158,7 +158,7 @@ ___
 Normalement, l'extension est créée avec Eclipse pour Java et [LOEclipse][41]. Pour contourner Eclipse, j'ai modifié LOEclipse afin de permettre la création de l'extension avec Apache Ant.  
 Pour créer l'extension HyperSQLOOo avec l'aide d'Apache Ant, vous devez:
 - Installer le [SDK Java][42] version 8 ou supérieure.
-- Installer [Apache Ant][43] version 1.9.1 ou supérieure.
+- Installer [Apache Ant][43] version 1.10.0 ou supérieure.
 - Installer [LibreOffice et son SDK][44] version 7.x ou supérieure.
 - Cloner le dépôt [HyperSQLOOo][45] sur GitHub dans un dossier.
 - Depuis ce dossier, accédez au répertoire: `source/HyperSQLOOo/`

source/HyperSQLOOo/.gitignore

@@ -3,4 +3,3 @@
 /dist/
 .project
 .pydevproject
-.unoproject

source/HyperSQLOOo/.unoproject

@@ -0,0 +1,10 @@
+#UNO project configuration file
+#Tue May 20 11:35:27 CEST 2025
+project.build=build
+project.idl=/idl
+project.implementation=HyperSQLOOo
+project.language=Python
+project.ooo=LibreOffice 7.6
+project.prefix=io.github.prrvchr
+project.sdk=7.6.7.2
+project.srcdir=/service

source/HyperSQLOOo/build.properties

@@ -1,4 +1,4 @@
 #UNO project Ant build configuration file
-#Tue Apr 29 00:36:32 CEST 2025
-office.install.dir=/lib/libreoffice
-sdk.dir=/lib/libreoffice/sdk
+#Tue May 20 11:35:27 CEST 2025
+office.install.dir=/opt/libreoffice7.6
+sdk.dir=/opt/libreoffice7.6/sdk

source/HyperSQLOOo/build.xml

@@ -8,10 +8,10 @@
         ************************************************************
     -->
 
-    <fail message="Please build using Ant 1.9.1 or higher.">
+    <fail message="Please build using Ant 1.10.0 or higher.">
         <condition>
             <not>
-                <antversion atleast="1.9.1"/>
+                <antversion atleast="1.10.0"/>
             </not>
         </condition>
     </fail>
@@ -93,10 +93,21 @@
         <mkdir dir="${idl.out.urd}"/>
         <mkdir dir="${idl.out.rdb}"/>
 
+        <first id="regview">
+            <fileset dir="${office.libs.path}" includes="**/regview,**/regview.exe"/>
+        </first>
+        <property name="sdk.regview" value="${toString:regview}"/>
+
+        <first id="idlr">
+            <fileset dir="${sdk.bin.dir}" includes="unoidl-read,unoidl-read.exe"/>
+        </first>
+        <property name="sdk.idlr" value="${toString:idlr}"/>
+
         <first id="idlw">
-            <fileset dir="${sdk.bin.dir}" includes="unoidl-write,unoidl_write.exe"/>
+            <fileset dir="${sdk.bin.dir}" includes="unoidl-write,unoidl-write.exe"/>
         </first>
         <property name="sdk.idlw" value="${toString:idlw}"/>
+
         <condition property="sdk.useidlw">
             <available file="${sdk.idlw}" type="file"/>
         </condition>
@@ -118,7 +129,7 @@
     </target>
 
     <target name="init-java" depends="init-env" if="project.isjava">
-        <echo message="Project is Java"/>
+        <echo message="Project is Java using version: ${ant.java.version}"/>
 
         <!-- Setting lib.dir dependencies default directory is /lib or /libs if exist -->
         <condition property="lib.dir" value="libs">
@@ -143,7 +154,7 @@
         <property name="src.module" value="${toString:module}"/>
         <condition property="src.withmodule">
             <and>
-                <javaversion atleast="9"/>
+                <javaversion atleast="11"/>
                 <available file="${src.module}" type="file"/>
             </and>
         </condition>
@@ -163,6 +174,12 @@
             </fileset>
         </path>
 
+        <path id="office.module.path">
+            <fileset dir="${office.libs.path}${file.separator}classes">
+                <include name="libreoffice.jar"/>
+            </fileset>
+        </path>
+
         <path id="build.lib.path">
             <filelist dir="${workspace.path}" files="${uno.java.classpath}"/>
         </path>
@@ -232,6 +249,10 @@
 
     <target name="compile-idlwrite" depends="merge-urd" if="sdk.useidlw">
         <echo message="Compile tool: ${sdk.idlw}"/>
+        <echo message="Office unotype: ${office.unotypes.rdb}"/>
+        <echo message="Office offapi: ${office.offapi.rdb}"/>
+        <echo message="idl dir: ${idl.dir}"/>
+        <echo message="rdb dir: ${idl.rdb.fullpath}"/>
 
         <delete file="${idl.rdb.fullpath}"/>
         <exec executable="${sdk.idlw}" failonerror="true">
@@ -242,7 +263,23 @@
         </exec>
     </target>
 
-    <target name="types" depends="compile-idlwrite" if="project.isjava">
+    <target name="show-idlc" depends="compile-idlwrite" if="sdk.useidlc">
+        <echo message="Tool regview: ${sdk.regview}"/>
+        <exec executable="${sdk.regview}" failonerror="true">
+            <arg value="${idl.rdb.fullpath}"/>
+        </exec>
+    </target>
+
+    <target name="show-idlw" depends="show-idlc" if="sdk.useidlw">
+        <echo message="Tool unoidl-read: ${sdk.idlr}"/>
+        <exec executable="${sdk.idlr}" failonerror="true">
+            <arg value="${office.unotypes.rdb}"/>
+            <arg value="${office.offapi.rdb}"/>
+            <arg value="${idl.rdb.fullpath}"/>
+        </exec>
+    </target>
+
+    <target name="types" depends="show-idlw" if="project.isjava">
         <condition property="args.offapi" value=" -X&quot;${office.offapi.rdb}&quot;" else="">
             <length string="${office.offapi.rdb}" when="greater" length="0" trim="true"/>
         </condition>
@@ -278,13 +315,13 @@
     <target name="compile-module" depends="compile-java" if="src.withmodule">
         <echo message="Build module path: ${build.classes.dir}"/>
         <echo message="Source dir: ${src.dir.absolute}"/>
-        <javac srcdir="${src.dir.absolute}" source="9" target="9" encoding="UTF-8" includeantruntime="false"
+        <javac srcdir="${src.dir.absolute}" source="11" target="11" encoding="UTF-8" includeantruntime="false"
             destdir="${build.classes.dir}" excludes="**/*Test*">
             <modulepath>
                 <pathelement location="${build.classes.dir}"/>
                 <path refid="build.class.path"/>
                 <path refid="build.lib.path"/>
-                <path refid="office.class.path"/>
+                <path refid="office.module.path"/>
             </modulepath>
         </javac>
     </target>

source/HyperSQLOOo/registration/TermsOfUse_en.md

@@ -1,3 +1,4 @@
+
 # Terms Of Use
 
 **Ce [document][1] en français.**

source/HyperSQLOOo/registration/TermsOfUse_fr.md

@@ -1,3 +1,4 @@
+
 # Conditions d'utilisation
 
 **This [document][1] in English.**

source/HyperSQLOOo/service/OptionsHandler.py

@@ -27,15 +27,20 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-import uno
 import unohelper
 
+from com.sun.star.logging.LogLevel import SEVERE
+
 from com.sun.star.awt import XContainerWindowEventHandler
 
 from com.sun.star.lang import XServiceInfo
 
 from hypersql import OptionsManager
 
+from hypersql import getLogger
+
+from hypersql import g_basename
+from hypersql import g_defaultlog
 from hypersql import g_identifier
 
 import traceback
@@ -51,14 +56,16 @@ class OptionsHandler(unohelper.Base,
     def __init__(self, ctx):
         self._ctx = ctx
         self._manager = None
+        self._logger = getLogger(ctx, g_defaultlog, g_basename)
+        self._url = 'xdbc:hsqldb:mem:dbversion'
 
     # XContainerWindowEventHandler
     def callHandlerMethod(self, window, event, method):
         try:
             handled = False
             if method == 'external_event':
                 if event == 'initialize':
-                    self._manager = OptionsManager(self._ctx, window, 'xdbc:hsqldb:mem:dbversion')
+                    self._manager = OptionsManager(self._ctx, self._logger, window, self._url)
                     handled = True
                 elif event == 'ok':
                     self._manager.saveSetting()
@@ -68,7 +75,7 @@ def callHandlerMethod(self, window, event, method):
                     handled = True
             return handled
         except Exception as e:
-            print("ERROR: %s - %s" % (e, traceback.format_exc()))
+            self._logger.logprb(SEVERE, 'OptionsHandler', 'callHandlerMethod', 301, e, traceback.format_exc())
 
     def getSupportedMethodNames(self):
         return ('external_event', )
@@ -81,7 +88,6 @@ def getImplementationName(self):
     def getSupportedServiceNames(self):
         return g_ImplementationHelper.getSupportedServiceNames(g_ImplementationName)
 
-
 g_ImplementationHelper.addImplementation(OptionsHandler,                  # UNO object class
                                          g_ImplementationName,            # Implementation name
                                          g_ServiceNames)                  # List of implemented services