Merge pull request #7 from prrvchr/v1.4.1

v1.4.1

Author: prrvchr

README.md

@@ -29,7 +29,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].**
 
-# version [1.4.0][6]
+# version [1.4.1][6]
 
 ## Introduction:
 
@@ -332,7 +332,13 @@ vCardOOo shares the Java library `UnoHelper.jar` with jdbcDriverOOo. Updating th
 - Requires the **OAuth2OOo extension at least version 1.6.0**.
 - Has been tested under LibreOfficeDev 26.2.
 
-### What remains to be done for version 1.4.0:
+### What has been done for version 1.4.1:
+
+- All modal windows now open correctly in modal mode.
+- Requires the **jdbcDriverOOo extension at least version 1.6.1**.
+- Requires the **OAuth2OOo extension at least version 1.6.1**.
+
+### What remains to be done for version 1.4.1:
 
 - Make the address book locally editable with replication of changes.
 
@@ -345,7 +351,7 @@ vCardOOo shares the Java library `UnoHelper.jar` with jdbcDriverOOo. Updating th
 [3]: <https://prrvchr.github.io/vCardOOo/README_fr>
 [4]: <https://prrvchr.github.io/vCardOOo/source/vCardOOo/registration/TermsOfUse_en>
 [5]: <https://prrvchr.github.io/vCardOOo/source/vCardOOo/registration/PrivacyPolicy_en>
-[6]: <https://prrvchr.github.io/vCardOOo#what-has-been-done-for-version-140>
+[6]: <https://prrvchr.github.io/vCardOOo#what-has-been-done-for-version-141>
 [7]: <https://prrvchr.github.io/>
 [8]: <https://www.libreoffice.org/download/download/>
 [9]: <https://www.openoffice.org/download/index.html>
@@ -368,7 +374,7 @@ vCardOOo shares the Java library `UnoHelper.jar` with jdbcDriverOOo. Updating th
 [26]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [27]: <img/vCardOOo.svg#middle>
 [28]: <https://github.com/prrvchr/vCardOOo/releases/latest/download/vCardOOo.oxt>
-[29]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.4.0#right>
+[29]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.4.1#right>
 [30]: <img/vCardOOo-1.png>
 [31]: <img/vCardOOo-2.png>
 [32]: <img/vCardOOo-3.png>

README_fr.md

@@ -29,7 +29,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5]**.
 
-# version [1.4.0][6]
+# version [1.4.1][6]
 
 ## Introduction:
 
@@ -332,7 +332,13 @@ vCardOOo partage la bibliothèque Java `UnoHelper.jar` avec jdbcDriverOOo. La mi
 - Nécessite l'extension **OAuth2OOo en version 1.6.0 minimum**.
 - A été testé sous LibreOfficeDev 26.2.
 
-### Que reste-t-il à faire pour la version 1.4.0:
+### Ce qui a été fait pour la version 1.4.1:
+
+- Toutes les fenêtres modales s'ouvrent désormais correctement en mode modal.
+- Nécessite l'extension **jdbcDriverOOo en version 1.6.1 minimum**.
+- Nécessite l'extension **OAuth2OOo en version 1.6.1 minimum**.
+
+### Que reste-t-il à faire pour la version 1.4.1:
 
 - Rendre le carnet d'adresses modifiable localement avec la réplication des modifications.
 
@@ -345,7 +351,7 @@ vCardOOo partage la bibliothèque Java `UnoHelper.jar` avec jdbcDriverOOo. La mi
 [3]: <https://prrvchr.github.io/vCardOOo>
 [4]: <https://prrvchr.github.io/vCardOOo/source/vCardOOo/registration/TermsOfUse_fr>
 [5]: <https://prrvchr.github.io/vCardOOo/source/vCardOOo/registration/PrivacyPolicy_fr>
-[6]: <https://prrvchr.github.io/vCardOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-140>
+[6]: <https://prrvchr.github.io/vCardOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-141>
 [7]: <https://prrvchr.github.io/README_fr>
 [8]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
 [9]: <https://www.openoffice.org/fr/Telecharger/>
@@ -368,7 +374,7 @@ vCardOOo partage la bibliothèque Java `UnoHelper.jar` avec jdbcDriverOOo. La mi
 [26]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [27]: <img/vCardOOo.svg#middle>
 [28]: <https://github.com/prrvchr/vCardOOo/releases/latest/download/vCardOOo.oxt>
-[29]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.4.0#right>
+[29]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.4.1#right>
 [30]: <img/vCardOOo-1_fr.png>
 [31]: <img/vCardOOo-2_fr.png>
 [32]: <img/vCardOOo-3_fr.png>

source/vCardOOo/build.properties

@@ -1,5 +1,5 @@
 #UNO project Ant build configuration file
-#Sun Oct 12 17:33:53 CEST 2025
+#Tue Nov 04 11:08:09 CET 2025
 office.install.dir=/opt/libreoffice7.6
 sdk.dir=/opt/libreoffice7.6/sdk
 uno.java.classpath=vinnie/dist/vinnie.jar, ezvcard/dist/ezvcard.jar, vCardOOo/lib/json-20250107.jar, vCardOOo/lib/UnoHelper.jar

source/vCardOOo/description.xml

@@ -28,7 +28,7 @@
              xmlns:d="http://openoffice.org/extensions/description/2006"
              xmlns:l="http://libreoffice.org/extensions/description/2011"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-  <version value="1.4.0"/>
+  <version value="1.4.1"/>
   <identifier value="io.github.prrvchr.vCardOOo"/>
   <platform value="all"/>
   <dependencies>

source/vCardOOo/source/io/github/prrvchr/carddav/CardProperty.java

@@ -57,9 +57,6 @@ public String getGetter() {
     }
 
     public Boolean isGroup() {
-        if (mIsGroup) {
-            System.out.println("CardProperty.isGroup() IsGroup: " + mIsGroup);
-        }
         return mIsGroup;
     }
 

source/vCardOOo/source/io/github/prrvchr/carddav/CardSync.java

@@ -98,7 +98,6 @@ public boolean supportsService(String service) {
     // com.sun.star.task.XJob:
     public Object execute(NamedValue[] arguments)
         throws SQLException {
-        System.out.println("CardSync.execute() 1");
         int cnum = 0;
         int gnum = 0;
         DataBase database = new DataBase(arguments);
@@ -148,12 +147,10 @@ public Object execute(NamedValue[] arguments)
                 database.commitBatchCall(cnum, gnum, stop);
                 database.close(result);
                 database.close(call);
-                System.out.println("CardSync.execute() 10 Count: " + cnum);
             } catch (Exception e) {
                 System.out.println("Error happened: " + e.getMessage());
                 e.printStackTrace();
             }
-            System.out.println("CardSync.execute() 2 End");
         }
         return null;
     }

source/vCardOOo/source/io/github/prrvchr/carddav/DataBase.java

@@ -131,7 +131,6 @@ public Map<String, CardProperty> getCardProperties()
 
     public boolean prepareBatchCall()
         throws SQLException {
-        System.out.println("DataBase.prepareBatchCall() 1");
         boolean batched = false;
         XArray columns = getColumnIds();
         if (columns != null) {
@@ -144,15 +143,13 @@ public boolean prepareBatchCall()
             XPreparedStatement call2 = mConnection.prepareCall("CALL \"MergeCardGroup\"(?,?)");
             mGroupSetting = UnoRuntime.queryInterface(XParameters.class, call2);
             mGroupCall = UnoRuntime.queryInterface(XPreparedBatchExecution.class, call2);
-            System.out.println("DataBase.prepareBatchCall() 2");
             batched = true;
         }
         return batched;
     }
 
     public XArray getColumnIds()
         throws SQLException {
-        System.out.println("DataBase._getColumnIds() 1");
         XArray columns = null;
         XPreparedStatement call = mConnection.prepareCall("CALL \"SelectColumnIds\"()");
         XResultSet result = call.executeQuery();
@@ -162,7 +159,6 @@ public XArray getColumnIds()
         }
         close(result);
         close(call);
-        System.out.println("DataBase._getColumnIds() 2");
         return columns;
     }
 
@@ -172,8 +168,6 @@ public int mergeCardData(int cid,
                              String[] suffixes,
                              String value)
         throws SQLException {
-        System.out.println("DataBase.mergeCardProperty() CardId: " + cid +
-                           " - Prefix: " + prefix + " - Label: " + label);
         final int CID = 3;
         final int PREFIX = 4;
         final int LABEL = 5;
@@ -201,7 +195,6 @@ public void commitBatchCall(int cnum,
                                 int gnum,
                                 DateTimeWithTimezone timestamp)
         throws SQLException {
-        System.out.println("DataBase.commitBatchCall() 1");
         if (cnum > 0) {
             mCardCall.executeBatch();
         }
@@ -215,7 +208,6 @@ public void commitBatchCall(int cnum,
         mCardCall = null;
         mCardSetting = null;
         updateCardSync(timestamp);
-        System.out.println("DataBase.commitBatchCall() 2 Count: " + cnum);
     }
 
     private void setBatchModeOn()
@@ -264,7 +256,6 @@ private void saveChanges(XStatement statement, boolean compact)
 
     public Map<Integer, JSONObject> getCardGroup()
         throws SQLException {
-        System.out.println("DataBase.getCardGroup() 1");
         Map<Integer, JSONObject> maps = new HashMap<Integer, JSONObject>();
         XPreparedStatement call = mConnection.prepareCall("CALL \"SelectCardGroup\"()");
         XResultSet result = call.executeQuery();
@@ -279,7 +270,6 @@ public Map<Integer, JSONObject> getCardGroup()
         }
         close(result);
         close(call);
-        System.out.println("DataBase.getCardGroup() 2 Count: " + maps.size());
         return maps;
     }
 

source/vCardOOo/vCardOOo.jar

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = bd0eb94d87c86a3cfa38e3d057035249f9af2e40
-	parent = e1875bd7eff77262dfe270cef0e1a44216be38d7
+	commit = c1a100b6f093ceef9aef387d4e88660e70568d3f
+	parent = d48a8dd0880359f0d1ac447fddadae9ff4b7753c
 	method = merge
 	cmdver = 0.4.9