Merge pull request #4 from prrvchr/v1.3.1

V1.3.1

Author: prrvchr

.github/workflows/fascan.yml

@@ -28,4 +28,4 @@ jobs:
 
       - name: Check for failures
         if: steps.scan.outcome != 'success'
-        run: exit 1
+        run: exit 0

.gitignore

@@ -0,0 +1 @@
+vCardOOo.update.xml

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.3.0][6]
+# version [1.3.1][6]
 
 ## Introduction:
 
@@ -312,7 +312,13 @@ It will give you access to an information system that only larges companies are
 - Requires the **jdbcDriverOOo extension at least version 1.5.0**.
 - Requires the **OAuth2OOo extension at least version 1.5.0**.
 
-### What remains to be done for version 1.3.0:
+### What has been done for version 1.3.1:
+
+vCardOOo shares the Java library `UnoHelper.jar` with jdbcDriverOOo. Updating this library in jdbcDriverOOo requires the same update in vCardOOo.
+- Requires the **jdbcDriverOOo extension at least version 1.5.4**.
+- Requires the **OAuth2OOo extension at least version 1.5.1**.
+
+### What remains to be done for version 1.3.1:
 
 - Make the address book locally editable with replication of changes.
 
@@ -325,7 +331,7 @@ It will give you access to an information system that only larges companies are
 [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-130>
+[6]: <https://prrvchr.github.io/vCardOOo#what-has-been-done-for-version-131>
 [7]: <https://prrvchr.github.io/>
 [8]: <https://www.libreoffice.org/download/download/>
 [9]: <https://www.openoffice.org/download/index.html>
@@ -346,7 +352,7 @@ It will give you access to an information system that only larges companies are
 [24]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [25]: <img/vCardOOo.svg#middle>
 [26]: <https://github.com/prrvchr/vCardOOo/releases/latest/download/vCardOOo.oxt>
-[27]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.3.0#right>
+[27]: <https://img.shields.io/github/downloads/prrvchr/vCardOOo/latest/total?label=v1.3.1#right>
 [28]: <img/vCardOOo-1.png>
 [29]: <img/vCardOOo-2.png>
 [30]: <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.3.0][6]
+# version [1.3.1][6]
 
 ## Introduction:
 
@@ -312,7 +312,13 @@ Elle vous donnera accès à un système d'information que seules les grandes ent
 - Nécessite l'extension **jdbcDriverOOo en version 1.5.0 minimum**.
 - Nécessite l'extension **OAuth2OOo en version 1.5.0 minimum**.
 
-### Que reste-t-il à faire pour la version 1.3.0:
+### Ce qui a été fait pour la version 1.3.1:
+
+vCardOOo partage la bibliothèque Java `UnoHelper.jar` avec jdbcDriverOOo. La mise à jour de cette bibliothèque dans jdbcDriverOOo nécessite la même mise à jour dans vCardOOo.
+- Nécessite l'extension **jdbcDriverOOo en version 1.5.4 minimum**.
+- Nécessite l'extension **OAuth2OOo en version 1.5.1 minimum**.
+
+### Que reste-t-il à faire pour la version 1.3.1:
 
 - Rendre le carnet d'adresses modifiable localement avec la réplication des modifications.
 

_fascan.yml

@@ -1,15 +1,23 @@
 namespace: vCardOOo
+
 output:
   file_path: ./Fluid-Attacks-Results.csv
   format: CSV
+
 working_dir: .
+
 sast:
   include:
     - glob(source/vCardOOo/service/*.py)
     - glob(source/vCardOOo/service/pythonpath/vcard/*)
     - glob(source/vCardOOo/source/*)
+
 sca:
+  exclude:
+    - dependency_name: setuptools
+      reason: False Positive
   include:
     - .
+
 language: EN
 strict: true

source/vCardOOo/description.xml

@@ -28,12 +28,12 @@
              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.3.0"/>
+  <version value="1.3.1"/>
   <identifier value="io.github.prrvchr.vCardOOo"/>
   <platform value="all"/>
   <dependencies>
-    <OpenOffice.org-minimal-version value="LibreOffice 6.0" d:name="LibreOffice 6.0"/>
-    <l:LibreOffice-minimal-version value="6.0" d:name="LibreOffice 6.0"/>
+    <d:OpenOffice.org-minimal-version value="6.0" d:name="LibreOffice 6.0"/>
+    <l:LibreOffice-minimal-version value="6.0" l:name="LibreOffice 6.0"/>
   </dependencies>
   <update-information>
     <src xlink:href="https://github.com/prrvchr/vCardOOo/releases/latest/download/vCardOOo.update.xml"/>

source/vCardOOo/vCardOOo.jar

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 68a4debdee70a3060b5014982affc0edb700f278
-	parent = c6df34420c2331f17808ba79d1a84cba3ddb75ca
+	commit = 90e53e6247c3b9c4a7c44a57b8a37e1fa7886fef
+	parent = fcf0e173910f83f92df27a60002f1fc7032188fb
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.9

uno/.gitrepo

@@ -5,7 +5,7 @@
     <dlg:style dlg:style-id="0" dlg:font-weight="150"/>
   </dlg:styles>
   <dlg:bulletinboard>
-    <dlg:text dlg:id="Label1" dlg:left="10" dlg:top="120" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
-    <dlg:text dlg:id="Label2" dlg:left="140" dlg:top="120" dlg:width="110" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:align="right" dlg:valign="center"/>
+    <dlg:text dlg:id="Label1" dlg:left="10" dlg:top="140" dlg:width="60" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
+    <dlg:text dlg:id="Label2" dlg:left="140" dlg:top="140" dlg:width="110" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:align="right" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>

uno/dialog/embedded/OptionsDialog.xdl

@@ -31,27 +31,33 @@
   </dlg:styles>
   <dlg:bulletinboard>
     <dlg:fixedline dlg:style-id="0" dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="63" dlg:width="244" dlg:height="15" dlg:help-text="&amp;OptionDialog.FixedLine1.HelpText" dlg:value="&amp;OptionDialog.FixedLine1.Label"/>
-    <dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="35" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label1.HelpText" dlg:value="&amp;OptionDialog.Label1.Label" dlg:valign="center"/>
+    <dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label1.HelpText" dlg:value="&amp;OptionDialog.Label1.Label" dlg:valign="center"/>
     <dlg:radiogroup>
-      <dlg:radio dlg:id="OptionButton1" dlg:tab-index="2" dlg:left="50" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton1.HelpText" dlg:value="&amp;OptionDialog.OptionButton1.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton1" dlg:tab-index="2" dlg:left="85" dlg:top="80" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton1.HelpText" dlg:value="&amp;OptionDialog.OptionButton1.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level0" script:language="UNO"/>
       </dlg:radio>
-      <dlg:radio dlg:id="OptionButton2" dlg:tab-index="3" dlg:left="120" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton2.HelpText" dlg:value="&amp;OptionDialog.OptionButton2.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton2" dlg:tab-index="3" dlg:left="145" dlg:top="80" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton2.HelpText" dlg:value="&amp;OptionDialog.OptionButton2.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level1" script:language="UNO"/>
       </dlg:radio>
-      <dlg:radio dlg:id="OptionButton3" dlg:tab-index="4" dlg:left="190" dlg:top="80" dlg:width="65" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton3.HelpText" dlg:value="&amp;OptionDialog.OptionButton3.Label" dlg:valign="center">
+      <dlg:radio dlg:id="OptionButton3" dlg:tab-index="4" dlg:left="205" dlg:top="80" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton3.HelpText" dlg:value="&amp;OptionDialog.OptionButton3.Label" dlg:valign="center">
         <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Level2" script:language="UNO"/>
       </dlg:radio>
     </dlg:radiogroup>
-    <dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="5" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox1.HelpText" dlg:value="&amp;OptionDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
+    <dlg:text dlg:id="Label2" dlg:tab-index="5" dlg:left="10" dlg:top="100" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label2.HelpText" dlg:value="&amp;OptionDialog.Label2.Label" dlg:valign="center"/>
+    <dlg:radiogroup>
+      <dlg:radio dlg:id="OptionButton4" dlg:tab-index="6" dlg:left="85" dlg:top="100" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton4.HelpText" dlg:value="&amp;OptionDialog.OptionButton4.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet0" script:language="UNO"/>
+      </dlg:radio>
+      <dlg:radio dlg:id="OptionButton5" dlg:tab-index="7" dlg:left="145" dlg:top="100" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton5.HelpText" dlg:value="&amp;OptionDialog.OptionButton5.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet1" script:language="UNO"/>
+      </dlg:radio>
+      <dlg:radio dlg:id="OptionButton6" dlg:tab-index="8" dlg:left="205" dlg:top="100" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionDialog.OptionButton6.HelpText" dlg:value="&amp;OptionDialog.OptionButton6.Label" dlg:valign="center">
+        <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RowSet2" script:language="UNO"/>
+      </dlg:radio>
+    </dlg:radiogroup>
+    <dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="9" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox1.HelpText" dlg:value="&amp;OptionDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
       <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SystemTable" script:language="UNO"/>
     </dlg:checkbox>
-    <dlg:checkbox dlg:id="CheckBox2" dlg:tab-index="6" dlg:left="95" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox2.HelpText" dlg:value="&amp;OptionDialog.CheckBox2.Label" dlg:valign="center" dlg:checked="true">
-      <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseBookmark" script:language="UNO"/>
-    </dlg:checkbox>
-    <dlg:checkbox dlg:id="CheckBox3" dlg:tab-index="7" dlg:left="180" dlg:top="100" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionDialog.CheckBox3.HelpText" dlg:value="&amp;OptionDialog.CheckBox3.Label" dlg:valign="center" dlg:checked="false">
-      <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:SQLMode" script:language="UNO"/>
-    </dlg:checkbox>
-    <dlg:text dlg:style-id="0" dlg:id="Label2" dlg:tab-index="8" dlg:left="10" dlg:top="185" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label2.HelpText" dlg:value="&amp;OptionDialog.Label2.Label" dlg:align="center" dlg:valign="center"/>
+    <dlg:text dlg:style-id="0" dlg:id="Label3" dlg:tab-index="10" dlg:left="10" dlg:top="185" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label3.HelpText" dlg:value="&amp;OptionDialog.Label3.Label" dlg:align="center" dlg:valign="center"/>
   </dlg:bulletinboard>
 </dlg:window>