Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: prrvchr
21 changes: 17 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**The use of this software subjects you to our [Terms Of Use][4].**

# version [1.2.2][5]
# version [1.3.0][5]

## Introduction:

Expand All @@ -51,6 +51,7 @@ Being free software I encourage you:
- To duplicate its [source code][15].
- To make changes, corrections, improvements.
- To open [issue][16] if needed.
- To [participate in the costs][17] of [CASA certification][18].

In short, to participate in the development of this extension.
Because it is together that we can make Free Software smarter.
Expand Down Expand Up @@ -322,7 +323,17 @@ ___

- Requires the **jdbcDriverOOo extension at least version 1.5.4**.

### What remains to be done for version 1.2.2:
### What has been done for version 1.2.3:

- Requires the **jdbcDriverOOo extension at least version 1.5.7**.

### What has been done for version 1.3.0:

- If the jdbcDriverOOo extension works without Java instrumentation, a warning message will be displayed in the extension options.
- Requires the **jdbcDriverOOo extension at least version 1.6.1**.
- Has been tested under LibreOfficeDev 26.2.

### What remains to be done for version 1.3.0:

- Add new language for internationalization...

Expand All @@ -332,7 +343,7 @@ ___
[2]: <https://prrvchr.github.io/HyperSQLOOo/>
[3]: <https://prrvchr.github.io/HyperSQLOOo/README_fr>
[4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_en>
[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-122>
[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-130>
[6]: <https://prrvchr.github.io/>
[7]: <https://www.libreoffice.org/download/download/>
[8]: <https://www.openoffice.org/download/index.html>
Expand All @@ -344,13 +355,15 @@ ___
[14]: <https://prrvchr.github.io/HyperSQLOOo/#how-to-migrate-an-embedded-database>
[15]: <https://github.com/prrvchr/HyperSQLOOo/>
[16]: <https://github.com/prrvchr/HyperSQLOOo/issues/new>
[17]: <https://github.com/sponsors/prrvchr>
[18]: <https://appdefensealliance.dev/casa>
[20]: <https://prrvchr.github.io/jdbcDriverOOo/#requirement>
[21]: <https://prrvchr.github.io/jdbcDriverOOo/img/jdbcDriverOOo.svg#middle>
[22]: <https://github.com/prrvchr/jdbcDriverOOo/releases/latest/download/jdbcDriverOOo.oxt>
[23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
[24]: <img/HyperSQLOOo.svg#middle>
[25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.2#right>
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.3.0#right>
[27]: <img/HyperSQLOOo-1.png>
[28]: <img/HyperSQLOOo-2.png>
[29]: <img/HyperSQLOOo-3.png>
Expand Down
21 changes: 17 additions & 4 deletions README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].**

# version [1.2.2][5]
# version [1.3.0][5]

## Introduction:

Expand All @@ -51,6 +51,7 @@ Etant un logiciel libre je vous encourage:
- A dupliquer son [code source][15].
- A apporter des modifications, des corrections, des améliorations.
- D'ouvrir un [dysfonctionnement][16] si nécessaire.
- De [participer au frais][17] de la [certification CASA][18].

Bref, à participer au developpement de cette extension.
Car c'est ensemble que nous pouvons rendre le Logiciel Libre plus intelligent.
Expand Down Expand Up @@ -322,7 +323,17 @@ ___

- Nécessite l'extension **jdbcDriverOOo en version 1.5.4 minimum**.

### Que reste-t-il à faire pour la version 1.2.2:
### Ce qui a été fait pour la version 1.2.3:

- Nécessite l'extension **jdbcDriverOOo en version 1.5.7 minimum**.

### Ce qui a été fait pour la version 1.3.0:

- Si l'extension jdbcDriverOOo fonctionne sans l'instrumentation Java, un message d'avertissement s'affichera dans les options de l'extension.
- Nécessite l'extension **jdbcDriverOOo en version 1.6.1 minimum**.
- A été testé sous LibreOfficeDev 26.2.

### Que reste-t-il à faire pour la version 1.3.0:

- Ajouter de nouvelles langue pour l'internationalisation...

Expand All @@ -332,7 +343,7 @@ ___
[2]: <https://prrvchr.github.io/HyperSQLOOo/>
[3]: <https://prrvchr.github.io/HyperSQLOOo/>
[4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_fr>
[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-122>
[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-130>
[6]: <https://prrvchr.github.io/README_fr>
[7]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
[8]: <https://www.openoffice.org/fr/Telecharger/>
Expand All @@ -344,13 +355,15 @@ ___
[14]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#comment-migrer-une-base-de-donn%C3%A9es-int%C3%A9gr%C3%A9e>
[15]: <https://github.com/prrvchr/HyperSQLOOo/>
[16]: <https://github.com/prrvchr/HyperSQLOOo/issues/new>
[17]: <https://github.com/sponsors/prrvchr>
[18]: <https://appdefensealliance.dev/casa>
[20]: <https://prrvchr.github.io/jdbcDriverOOo/README_fr#pr%C3%A9requis>
[21]: <https://prrvchr.github.io/jdbcDriverOOo/img/jdbcDriverOOo.svg#middle>
[22]: <https://github.com/prrvchr/jdbcDriverOOo/releases/latest/download/jdbcDriverOOo.oxt>
[23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
[24]: <img/HyperSQLOOo.svg#middle>
[25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.2#right>
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.3.0#right>
[27]: <img/HyperSQLOOo-1_fr.png>
[28]: <img/HyperSQLOOo-2_fr.png>
[29]: <img/HyperSQLOOo-3_fr.png>
Expand Down
4 changes: 3 additions & 1 deletion source/HyperSQLOOo/Drivers.xcu
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE oor:component-data SYSTEM "component-update.dtd">
<oor:component-data
xmlns:install="http://openoffice.org/2004/installation"
xmlns:oor="http://openoffice.org/2001/registry"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
oor:package="org.openoffice.Office.DataAccess"
Expand Down Expand Up @@ -122,7 +124,7 @@
<value>false</value>
</prop>
</node>
<node oor:name="TablePrivilegesSettings" oor:op="replace">
<node oor:name="PrivilegesSettings" oor:op="replace">
<prop oor:name="Value" oor:type="oor:string-list">
<value oor:separator="|">SELECT|1|INSERT|2|UPDATE|4|DELETE|8|REFERENCES|128</value>
</prop>
Expand Down
6 changes: 3 additions & 3 deletions source/HyperSQLOOo/Options.xcs
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE oor:component-schema SYSTEM "component-schema.dtd">
<oor:component-schema
xml:lang="en-US"
xmlns:oor="http://openoffice.org/2001/registry"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
oor:package="io.github.prrvchr"
oor:name="HyperSQLOOo">
oor:name="HyperSQLOOo"
xml:lang="en-US">
<component>
<prop oor:name="ApiLevel" oor:type="xs:short"/>
<prop oor:name="CachedRowSet" oor:type="xs:short"/>
Expand Down
4 changes: 2 additions & 2 deletions source/HyperSQLOOo/Options.xcu
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE oor:component-data SYSTEM "component-update.dtd">
<oor:component-data
xml:lang="en-US"
xmlns:install="http://openoffice.org/2004/installation"
xmlns:oor="http://openoffice.org/2001/registry"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
oor:package="io.github.prrvchr"
oor:name="HyperSQLOOo">
<prop oor:name="ApiLevel" oor:op="fuse">
Expand Down
3 changes: 2 additions & 1 deletion source/HyperSQLOOo/OptionsDialog.xcu
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE oor:component-data SYSTEM "component-update.dtd">
<oor:component-data
xmlns:install="http://openoffice.org/2004/installation"
xmlns:oor="http://openoffice.org/2001/registry"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
oor:package="org.openoffice.Office"
oor:name="OptionsDialog">
<node oor:name="Nodes">
Expand Down
1 change: 1 addition & 0 deletions source/HyperSQLOOo/component-schema.dtd
1 change: 1 addition & 0 deletions source/HyperSQLOOo/component-update.dtd
2 changes: 1 addition & 1 deletion source/HyperSQLOOo/description.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.2"/>
<version value="1.3.0"/>
<identifier value="io.github.prrvchr.HyperSQLOOo"/>
<platform value="all"/>
<dependencies>
Expand Down
1 change: 1 addition & 0 deletions source/HyperSQLOOo/dialogs/dialog.dtd
1 change: 1 addition & 0 deletions source/HyperSQLOOo/idl/com/sun/star/task/XTaskEvent.idl
4 changes: 2 additions & 2 deletions source/HyperSQLOOo/package.properties

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions source/HyperSQLOOo/service/OptionsHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def callHandlerMethod(self, window, event, method):
handled = True
return handled
except Exception as e:
print("OptionsHandler.callHandlerMethod() ERROR: %s" % traceback.format_exc())
self._logger.logprb(SEVERE, 'OptionsHandler', 'callHandlerMethod', 301, e, traceback.format_exc())

def getSupportedMethodNames(self):
Expand Down
1 change: 0 additions & 1 deletion source/HyperSQLOOo/service/pythonpath/hypersql/option

This file was deleted.

Binary file modified source/HyperSQLOOo/types.rdb
Binary file not shown.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 66e9aea6994add573be9c1556b90c87449543a11
parent = 1597a53409658078944bc6348a59826b01fad6d8
commit = c1a100b6f093ceef9aef387d4e88660e70568d3f
parent = 6ab23df5dd63d796e2894312422010362da34326
method = merge
cmdver = 0.4.9
44 changes: 44 additions & 0 deletions uno/dialog/card/OptionDialog.xdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
╔════════════════════════════════════════════════════════════════════════════════════╗
║ ║
║ Copyright (c) 2020-25 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"), ║
║ to deal in the Software without restriction, including without limitation ║
║ the rights to use, copy, modify, merge, publish, distribute, sublicense, ║
║ and/or sell copies of the Software, and to permit persons to whom the Software ║
║ is furnished to do so, subject to the following conditions: ║
║ ║
║ The above copyright notice and this permission notice shall be included in ║
║ all copies or substantial portions of the Software. ║
║ ║
║ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ║
║ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ║
║ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ║
║ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ║
║ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ║
║ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE ║
║ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ║
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="OptionDialog" dlg:left="0" dlg:top="0" dlg:width="260" dlg:height="225" dlg:help-text="&amp;OptionDialog.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;OptionDialog.Title" dlg:withtitlebar="false">
<dlg:styles>
<dlg:style dlg:style-id="0" dlg:font-weight="150"/>
</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="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label1.HelpText" dlg:value="&amp;OptionDialog.Label1.Label" dlg:valign="center"/>
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="2" dlg:left="100" dlg:top="80" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label2.HelpText" dlg:value="&amp;OptionDialog.Label2.Label" dlg:valign="center"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="4" dlg:disabled="true" dlg:left="100" dlg:top="100" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionDialog.CommandButton1.HelpText" dlg:value="&amp;OptionDialog.CommandButton1.Label">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:ViewData" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionDialog.Label3.HelpText" dlg:value="&amp;OptionDialog.Label3.Label" dlg:valign="center"/>
<dlg:textfield dlg:id="TextField1" dlg:tab-index="6" dlg:left="100" dlg:top="120" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionDialog.TextField1.HelpText" dlg:value="&amp;OptionDialog.TextField1.Text"/>
</dlg:bulletinboard>
</dlg:window>

14 changes: 4 additions & 10 deletions uno/dialog/card/OptionsDialog.xdl
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,14 @@
║ ║
╚════════════════════════════════════════════════════════════════════════════════════╝
-->
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="OptionsDialog" dlg:left="0" dlg:top="0" dlg:width="260" dlg:height="225" dlg:help-text="&amp;OptionsDialog.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;OptionsDialog.Title" dlg:withtitlebar="false">
<dlg:styles>
<dlg:style dlg:style-id="0" dlg:font-weight="150"/>
</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;OptionsDialog.FixedLine1.HelpText" dlg:value="&amp;OptionsDialog.FixedLine1.Label"/>
<dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="2" dlg:left="100" dlg:top="80" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:valign="center"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="4" dlg:disabled="true" dlg:left="100" dlg:top="100" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:ViewData" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
<dlg:textfield dlg:id="TextField1" dlg:tab-index="6" dlg:left="100" dlg:top="120" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.TextField1.HelpText" dlg:value="&amp;OptionsDialog.TextField1.Text"/>
<dlg:text dlg:style-id="0" dlg:id="Label4" dlg:tab-index="7" dlg:left="10" dlg:top="145" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:style-id="0" dlg:id="Label1" dlg:tab-index="5" dlg:left="10" dlg:top="145" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:align="center" dlg:valign="center"/>
<dlg:linklabel dlg:style-id="0" dlg:id="Hyperlink1" dlg:tab-index="6" dlg:left="10" dlg:top="145" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Hyperlink1.HelpText" dlg:value="&amp;OptionsDialog.Hyperlink1.Label" dlg:align="center" dlg:valign="center"/>
</dlg:bulletinboard>
</dlg:window>

8 changes: 8 additions & 0 deletions uno/dialog/card/OptionsDialog_en_US.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
OptionsDialog.HelpText=
OptionsDialog.Title=
OptionsDialog.Label1.HelpText=
OptionsDialog.Label1.Label=The changes will take effect after restarting LibreOffice...
OptionsDialog.Hyperlink1.HelpText=
OptionsDialog.Hyperlink1.Label=You must install the Java Instrumentation Agent to use jdbcDriverOOO...
OptionsDialog.Hyperlink1.Url=https://prrvchr.github.io/jdbcDriverOOo/#how-to-install-java-instrumentation

8 changes: 8 additions & 0 deletions uno/dialog/card/OptionsDialog_fr_FR.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
OptionsDialog.HelpText=
OptionsDialog.Title=
OptionsDialog.Label1.HelpText=
OptionsDialog.Label1.Label=Les modifications prendront effet apr\u00e8s le red\u00e9marrage de LibreOffice...
OptionsDialog.Hyperlink1.HelpText=
OptionsDialog.Hyperlink1.Label=Veuillez installer l'instrumentation Java pour utiliser jdbcDriverOOO...
OptionsDialog.Hyperlink1.Url=https://prrvchr.github.io/jdbcDriverOOo/README_fr#comment-installer-linstrumentation-java

Loading