diff -Nru dmaths-4.3.0.0+dfsg1/changelog dmaths-4.4.0.0+dfsg1/changelog --- dmaths-4.3.0.0+dfsg1/changelog 2017-04-05 15:53:04.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/changelog 2017-09-08 16:42:40.000000000 +0000 @@ -1,3 +1,19 @@ +Version 4.4.0.0 + +Mise en ligne le 6 mai 2017 + +Version LibreOffice/OpenOffice : + + La configuration utilisateur ou un rapport de bug peut être envoyé aux développeurs (Ctrl+Alt+R/Alt+F7). + Pour MAC : + le raccourci clavier de la boîte de dialogue du calcul formel devient Cmd+Alt+X, + correction d'un bug concernant l'utilisation du calcul formel. + +Toutes versions : + + Calcul formel : correction d'un bug apparu dans la récupération des variables enregistrées. + + Version 4.3.0.0 Mise en ligne le 4 avril 2017 diff -Nru dmaths-4.3.0.0+dfsg1/debian/changelog dmaths-4.4.0.0+dfsg1/debian/changelog --- dmaths-4.3.0.0+dfsg1/debian/changelog 2017-04-05 16:37:52.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/debian/changelog 2017-09-08 17:11:23.000000000 +0000 @@ -1,3 +1,19 @@ +dmaths (4.4.0.0+dfsg1-1) unstable; urgency=low + + * New upstream release. + + Update upstream changelog. + + Update debian/README.source. + * Update Standards-Version to 4.1.0. + + Update field in debian/control file. + + Update compat level to 10 in debian/compat + file and dephelper in debian/control. + * Change Priority field to optional in debian/control + file (extra is deprecated). + * Remove Suggests field in debian/control due to + problems of packages dia and drgeo. + + -- Innocent De Marchi Fri, 08 Sep 2017 18:11:23 +0100 + dmaths (4.3.0.0+dfsg1-1) unstable; urgency=low * New upstream release. diff -Nru dmaths-4.3.0.0+dfsg1/debian/compat dmaths-4.4.0.0+dfsg1/debian/compat --- dmaths-4.3.0.0+dfsg1/debian/compat 2016-04-23 15:10:43.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/debian/compat 2017-09-08 16:21:55.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru dmaths-4.3.0.0+dfsg1/debian/control dmaths-4.4.0.0+dfsg1/debian/control --- dmaths-4.3.0.0+dfsg1/debian/control 2016-08-06 16:07:53.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/debian/control 2017-09-08 17:11:23.000000000 +0000 @@ -1,9 +1,9 @@ Source: dmaths Section: doc -Priority: extra +Priority: optional Maintainer: Innocent De Marchi -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.0 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dmaths.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/dmaths.git Homepage: http://www.dmaths.org @@ -11,7 +11,6 @@ Package: libreoffice-dmaths Architecture: all Depends: libreoffice-writer | libreoffice-draw, zenity, ${misc:Depends} -Suggests: dia, drgeo Description: Formula editing plug-in for LibreOffice Writer This package integrates with LibreOffice to simplify the editing of mathematical and scientific formulas. It also allows you to use your diff -Nru dmaths-4.3.0.0+dfsg1/debian/README.source dmaths-4.4.0.0+dfsg1/debian/README.source --- dmaths-4.3.0.0+dfsg1/debian/README.source 2017-04-05 15:51:21.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/debian/README.source 2017-09-08 16:44:17.000000000 +0000 @@ -4,14 +4,14 @@ repackaging to leave the sources for the compilation of the package. #! /bin/bash -mkdir dmaths-4.3.0.0+dfsg1 -cp DmathsAddon.oxt dmaths-4.3.0.0+dfsg1/DmathsAddon.oxt +mkdir dmaths-4.4.0.0+dfsg1 +cp DmathsAddon.oxt dmaths-4.4.0.0+dfsg1/DmathsAddon.oxt rm DmathsAddon.oxt -cp changelog dmaths-4.3.0.0+dfsg1/changelog -cd dmaths-4.3.0.0+dfsg1 +cp changelog dmaths-4.4.0.0+dfsg1/changelog +cd dmaths-4.4.0.0+dfsg1 mkdir dmaths unzip DmathsAddon.oxt -d dmaths -#rm -r DmathsAddon/Fichiers/userguides/reglestypo +rm -r dmaths/Fichiers/userguides/reglestypo rm -r dmaths/Fichiers/fonts rm -f dmaths/DmInstall/*.properties~ rm -f dmaths/Fichiers/icons/appspref/Thumbs.db @@ -36,7 +36,7 @@ rm -r dmaths/Fichiers/.directory rm -r dmaths/Fichiers/Windows/*.exe cd .. -tar -zcvf dmaths_4.3.0.0+dfsg1.orig.tar.gz dmaths-4.3.0.0+dfsg1 -rm -r dmaths-4.3.0.0+dfsg1 +tar -zcvf dmaths_4.4.0.0+dfsg1.orig.tar.gz dmaths-4.4.0.0+dfsg1 +#rm -r dmaths-4.4.0.0+dfsg1 --- Innocent De Marchi Wed, 05 Apr 2017 17:41:52 +0100 +-- Innocent De Marchi Fri, 08 Sep 2017 18:16:23 +0100 diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Accelerators.xcu dmaths-4.4.0.0+dfsg1/dmaths/Accelerators.xcu --- dmaths-4.3.0.0+dfsg1/dmaths/Accelerators.xcu 2017-04-05 06:19:14.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Accelerators.xcu 2017-05-21 19:20:28.000000000 +0000 @@ -1,7 +1,16 @@ - + + + + vnd.sun.star.script:Dmaths.RapportBug.EnvoieConfiguration?language=Basic&location=application + + + + + + @@ -9,6 +18,7 @@ + @@ -114,7 +124,7 @@ vnd.sun.star.script:CmathOOo.mImportFromLatex.PasteFromLatex?language=Basic&location=application - + vnd.sun.star.script:Dmaths.Xcas.ChargeDialogCalculFormel?language=Basic&location=application diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Addons.xcu dmaths-4.4.0.0+dfsg1/dmaths/Addons.xcu --- dmaths-4.3.0.0+dfsg1/dmaths/Addons.xcu 2017-04-05 06:19:14.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Addons.xcu 2017-05-21 19:20:28.000000000 +0000 @@ -491,13 +491,13 @@ com.sun.star.text.TextDocument - Calcul formel [Alt+X/⌘+X] - Symbolische Mathemathik [Alt+X/⌘+X] - Calcolo simbolico [Alt+X/⌘+X] - Computação simbólica [Alt+X/⌘+X] - Symbolic computation [Alt+X/⌘+X] - Sümboolne arvutamine [Alt+X/⌘+X] - Computación simbólica [Alt+X/⌘+X] + Calcul formel [Alt+X/⌘+Alt+X] + Symbolische Mathemathik [Alt+X/⌘+Alt+X] + Calcolo simbolico [Alt+X/⌘+Alt+X] + Computação simbólica [Alt+X/⌘+Alt+X] + Symbolic computation [Alt+X/⌘+Alt+X] + Sümboolne arvutamine [Alt+X/⌘+Alt+X] + Computación simbólica [Alt+X/⌘+Alt+X] macro:///Dmaths.Xcas.ChargeDialogCalculFormel @@ -1435,13 +1435,13 @@ com.sun.star.text.TextDocument - Calcul formel [Alt+X/⌘+X] - Symbolische Mathemathik [Alt+X/⌘+X] - Calcolo simbolico [Alt+X/⌘+X] - Computação simbólica [Alt+X/⌘+X] - Symbolic computation [Alt+X/⌘+X] - Sümboolne arvutamine [Alt+X/⌘+X] - Computación simbólica [Alt+X/⌘+X] + Calcul formel [Alt+X/⌘+Alt+X] + Symbolische Mathemathik [Alt+X/⌘+Alt+X] + Calcolo simbolico [Alt+X/⌘+Alt+X] + Computação simbólica [Alt+X/⌘+Alt+X] + Symbolic computation [Alt+X/⌘+Alt+X] + Sümboolne arvutamine [Alt+X/⌘+Alt+X] + Computación simbólica [Alt+X/⌘+Alt+X] macro:///Dmaths.Xcas.ChargeDialogCalculFormel diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/description.xml dmaths-4.4.0.0+dfsg1/dmaths/description.xml --- dmaths-4.3.0.0+dfsg1/dmaths/description.xml 2017-04-05 06:19:14.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/description.xml 2017-05-21 19:19:56.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/DialogStrings_de_DE.properties dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/DialogStrings_de_DE.properties --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/DialogStrings_de_DE.properties 2017-04-05 06:19:14.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/DialogStrings_de_DE.properties 2017-05-21 19:26:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Strings for Dialog Library Dmaths +# Strings for Dialog Library Dmaths 4.4-DE 0.Angle.HelpText= 1.Angle.Title=Dmaths: Winkel 2.Angle.TextField2.HelpText= @@ -2644,7 +2644,6 @@ 4853.CouleurFormules.CheckBox2.Label=CheckBox1 4854.CouleurFormules.CheckBox3.HelpText= 4855.CouleurFormules.CheckBox3.Label=Umrandete Formeln -adres=de la m\u00eame couleur =Kanten der gleichen Farbe 4856.CouleurFormules.CheckBox2.HelpText= 4857.CouleurFormules.CheckBox2.Label=Kanten der gleichen Farbe 4924.ComboBox1.StringItemList=Arial diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/DialogStrings_fr_FR.properties dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/DialogStrings_fr_FR.properties --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/DialogStrings_fr_FR.properties 2017-04-05 06:19:14.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/DialogStrings_fr_FR.properties 2017-05-21 19:20:44.000000000 +0000 @@ -2479,7 +2479,7 @@ 4481.CreeGdmath.NormesDmaths.HelpText= 4482.CreeGdmath.NormesDmaths.Label=Mettre aux normes Dmaths 4485.Xcas.HelpText= -4486.Xcas.Title=Dmaths : effectuer un calcul formel. Alt+R/\u2318+R pour r\u00e9p\u00e9ter le dernier calcul effectu\u00e9 +4486.Xcas.Title=Dmaths : effectuer un calcul formel. Alt+R/\u2318+Alt+R pour r\u00e9p\u00e9ter le m\u00eame calcul 4509.Xcas.simplify.HelpText= 4510.Xcas.simplify.Label=Simplifier 4511.Xcas.expand.HelpText= diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Options.xdl dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Options.xdl --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Options.xdl 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Options.xdl 2017-05-21 19:20:44.000000000 +0000 @@ -12,7 +12,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -101,7 +101,7 @@ - + diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/RapportBug.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/RapportBug.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/RapportBug.xba 1970-01-01 00:00:00.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/RapportBug.xba 2017-05-21 19:20:44.000000000 +0000 @@ -0,0 +1,165 @@ + + +'************************************************ +'Copyright (C) 2008-2017 Didier Dorange-Pattoret +'38, chemin de l'Abbaye +'74940 Annecy le Vieux +'France +'ddorange@dmaths.com +' +'This library is free software; you can redistribute it and/or +'modify it under the terms of the GNU General Public Licence (GPL) +'as published by the Free Software Foundation; either +'version 2.1 of the License, or (at your option) any later version. + +'This library is distributed in the hope that it will be useful, +'but WITHOUT ANY WARRANTY; without even the implied warranty of +'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +'General Public License for more details. + +'You should have received a copy of the GNU General Public Licence (GPL) +'along with this library; if not, write to the Free Software +'Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +'************************************************ +'------------------------------------------------------------------------------------------------------------------ + +Sub TraiteErreur(iNomMacro As String, iNumLigne as Integer, iNumErreur As Integer, sTexteErreur As String) + Dim monMessage, maQuestion As String + monMessage = "L'erreur numero " & iNumErreur & " s'est produite ligne " & iNumLigne + monMessage = monMessage & Chr(13) & " de la macro " & iNomMacro & Chr(13) + maQuestion = "Voulez-vous envoyez un rapport de bug aux développeurs ?" & Chr(13) + If MsgBox(monMessage & Chr(13) & maQuestion, 16+4 ,"Dmaths")=6 Then + monMessage = monMessage & " : " & sTexteErreur + EnvoyerE_Mail(monMessage) + End If +End Sub + +Sub EnvoieConfiguration + EnvoyerE_Mail +End Sub + + + +Sub EnvoyerE_Mail(Optional monMessage As String) + Dim sAnnexes(5) As String + Dim sRunIcas As String + Call VerifOperationnel + If IsMissing(monMessage) Then monMessage = "" + If FileExists(sCheminDmathsUtilisateur & "giac.sav") Then sAnnexes(0) = convertToURL(sCheminDmathsUtilisateur & "giac.sav") + If FileExists(sCheminDmathsUtilisateur & "giac.in") Then sAnnexes(1) = convertToURL(sCheminDmathsUtilisateur & "giac.in") + If FileExists(sCheminDmathsUtilisateur & "giac.out") Then sAnnexes(2) = convertToURL(sCheminDmathsUtilisateur & "giac.out") + If FileExists(sCheminDmathsUtilisateur & "giac.var") Then sAnnexes(3) = convertToURL(sCheminDmathsUtilisateur & "giac.var") + If FileExists(sCheminDmathsUtilisateur & "dmoptions.txt") Then sAnnexes(4) = convertToURL(sCheminDmathsUtilisateur & "dmoptions.txt") + If IsMacOS Then + sRunIcas = "runicas.scpt" + ElseIf GetGuiType = 1 Then + sRunIcas = "runicas.bat" + Else + sRunIcas = "runicas.sh" + End if + If FileExists(sCheminDmathsUtilisateur & sRunIcas) Then sAnnexes(5) = convertToURL(sCheminDmathsUtilisateur & sRunIcas) + SendMel(monMessage,sAnnexes) +End Sub + + + +rem cette macro permet de construire le courriel de rapport de bug envoyé à ddorange@dmaths.org +Sub SendMel(monMessage As String, sAnnexes() As String) + ' On Error Resume Next + Dim oMailer as Object, unClient as Object, monMel as Object + Dim monSujet As String + If OOoName() = "LibreOffice" Then + If GetGUIType=1 Then + oMailer=CreateUnoService("com.sun.star.system.SimpleSystemMail") + Else + oMailer=CreateUnoService("com.sun.star.system.SimpleCommandMail") + End If + unClient = oMailer.querySimpleMailClient() + monMel = unClient.createSimpleMailMessage() + Else + oMailer = CreateUnoService("com.sun.star.system.SystemMailProvider") + unClient = oMailer.queryMailClient() + monMel = unClient.createMailMessage() + Endif + + If IsNull(unClient) then + MsgBox("Client de messagerie non disponible", 16) + stop + End If + + monSujet = IIf(Len(monMessage)=0,"Ma configuration","Rapport de bug dans Dmaths : " & monMessage) + With monMel + .Recipient = "ddorange@dmaths.org" + '.Originator = "expediteur@test.com" + .Subject = monSujet + .Body = monMessage & " [ .... ] " & TrouveSysteme + .Attachement = sAnnexes() + End With + + If OOoName() = "LibreOffice" Then + unClient.sendSimpleMailMessage(monMel,com.sun.star.system.SimpleMailClientFlags.NO_USER_INTERFACE)'0 necessite l'intervention de l'utilisateur pour envoyer '1 Envoi auto + Else + unClient.sendMailMessage(monMel,1) 'com.sun.star.system.SimpleMailClientFlags.NO_USER_INTERFACE) + Endif + +End Sub + + +Function TrouveSysteme As String + Dim monSysteme, s As String + Dim iSys As Integer + If GetGuitype = 4 and FileExists("/Users") Then iSys = 3 Else iSys = Getguitype + Select Case iSys + Case 1 + monSysteme = "[Système d'exploitation : Windows" & "]" & Chr(13) + Case 3 + monSysteme = "[Système d'exploitation : MacOsX" & "]" & Chr(13) + Case 4 + monSysteme = "[Système d'exploitation : Linux" & "]" & Chr(13) + End Select + monSysteme = monSysteme & "[Nom de la suite : " & OOoName() & "]" & Chr(13) + monSysteme = monSysteme & "[Version de OOo/SO/Neo : " & OOoNumVersion() + If getGuitype = 1 Then monSysteme = monSysteme & " " & LO5Win64or32 & "]" & Chr(13) Else monSysteme = monSysteme & "]" & Chr(13) + monSysteme = monSysteme & "[Langue OOo/SO/Neo : " & GetRepertoirePath("vlang") & "]" & Chr(13) + monSysteme = monSysteme & "[Répertoire d'installation de OOo/SO/Neo : " & GetRepertoirePath("inst") & "]" & Chr(13) + monSysteme = monSysteme & "[Droits d'écriture dans le répertoire d'installation de OOo/SO/Neo : "& ControleDroits(GetRepertoirePath("inst")) & "]" & Chr(13) + monSysteme = monSysteme & "[Chemin dossier utilisateur : " & GetRepertoirePath("user") & "]" & Chr(13) + s = GetRepertoirePath("user")& GetPathSeparator &"config" + monSysteme = monSysteme & "[Droits d'écriture dans le dossier utilisateur : " & ControleDroits(s) & "]" & Chr(13) + If Not TestPresencesMath Then monSysteme = monSysteme & "Module Math NON INSTALLE " & "]" & Chr(13) + monSysteme = monSysteme & "[Installation multi-utilisateurs : " & TestInstallRezo & "]" & Chr(13) + monSysteme = monSysteme & "[Version de Dmaths : " & Cstr(iVersion) & "]" & Chr(13) + monSysteme = monSysteme & "[Chemin Dmaths : " & ConvertFromURL(fCheminDmaths) & "]" & Chr(13) + monSysteme = monSysteme & "[Chemin Icas : " & sCheminIcas & "]" & Chr(13) + monSysteme = monSysteme & "[Chemin IcasBatch : " & sCheminIcasBatch & "]" & Chr(13) + + TrouveSysteme = monSysteme + +End Function + + + + +Function LO5Win64or32 As String + If (getGuitype = 1 And Instr(GetRepertoirePath("inst"),"x86") = 0 and getSolarVersion()>=50000 and ENVIRON("PROCESSOR_ARCHITECTURE")="AMD64") Then + LO5Win64or32 = "64 bits" + Else + LO5Win64or32 = "32 bits" + Endif +End Function + + +Function TestPresencesMath As Boolean + Dim sCheminMath, sAvertoMessage As String + sCheminMath = GetRepertoirePath("prog") & GetPathSeparator & "smath" + If GetGuiType = 1 Then sCheminMath = sCheminMath & ".exe" + If (Not FileExists(sCheminMath) and Not IsMacOs) Then + TestPresencesMath = False + Else + TestPresencesMath = True + Endif +End Function + + + \ No newline at end of file diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/script.xlb dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/script.xlb --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/script.xlb 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/script.xlb 2017-05-21 19:20:44.000000000 +0000 @@ -29,4 +29,5 @@ + \ No newline at end of file diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tableau_de_variations.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tableau_de_variations.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tableau_de_variations.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tableau_de_variations.xba 2017-05-21 19:20:44.000000000 +0000 @@ -807,7 +807,7 @@ oProvider = oDoc.CurrentController.Frame oDispHelper = createUnoService("com.sun.star.frame.DispatchHelper") ' Gere le probleme du executeDispatch qui se fait parfois trop rapidement - On Error GoTo TraiteErreur + On Error GoTo TraiteErreurTV Wait 500 DIM Array(0) as new com.sun.star.beans.PropertyValue @@ -820,7 +820,7 @@ Exit Sub - TraiteErreur: + TraiteErreurTV: If err=1 Then wait 100 iCptErreur = iCptErreur + 50 @@ -883,7 +883,7 @@ obj.LeftMargin = cint(iMargesFormules)*100 obj.RightMargin = cint(iMargesFormules)*100 ' Xray oCurseur - On Error GoTo TraiteErreur + On Error GoTo TraiteErreurTV oCurseur.Text.insertTextContent(oCurseur, obj, false) Rem calibrage par défaut des formules ajouté le 24/07/2016 obj.Model.BaseFontHeight = oCurseur.CharHeight @@ -904,7 +904,7 @@ obj.model.setmodified(true) Endif - TraiteErreur: + TraiteErreurTV: If err=1 Then wait 50 iCptErreur=iCptErreur+50 diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tableau.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tableau.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tableau.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tableau.xba 2017-05-21 19:20:44.000000000 +0000 @@ -26,90 +26,90 @@ Public oDialogTableau as Object Sub LanceCreationTableau -Call VerifOperationnel -LoadOptionsTableauDmaths -oDialogTableau = LoadDialog("Dmaths","Tableau") -oDialogTableau.Execute() + Call VerifOperationnel + LoadOptionsTableauDmaths + oDialogTableau = LoadDialog("Dmaths","Tableau") + oDialogTableau.Execute() End Sub Sub FinCreationTableau -oDialogTableau.EndExecute() + oDialogTableau.EndExecute() End Sub Sub InsereTableau -rem ---------------------------------------------------------------------- -rem define variables -dim document as object -dim dispatcher as object -dim inrows, incols,iflag as integer -rem ---------------------------------------------------------------------- -rem get access to the document - oDesktop = createUnoService("com.sun.star.frame.Desktop") - document= oDesktop.getCurrentComponent().getCurrentController() -dispatcher = createUnoService("com.sun.star.frame.DispatchHelper") -rem ---------------------------------------------------------------------- -inrows = Csng(oDialogTableau.Model.TextField1.Text) -incols = Csng(oDialogTableau.Model.TextField2.Text) -If oDialogTableau.Model.CheckBox1.State = 1 and oDialogTableau.Model.CheckBox2.State = 1 Then iflag = 15 -If oDialogTableau.Model.CheckBox1.State = 0 and oDialogTableau.Model.CheckBox2.State = 0 Then iflag = 8 -If oDialogTableau.Model.CheckBox1.State = 1 and oDialogTableau.Model.CheckBox2.State = 0 Then iflag = 14 -If oDialogTableau.Model.CheckBox1.State = 0 and oDialogTableau.Model.CheckBox2.State = 1 Then iflag = 9 - -dim args1(3) as new com.sun.star.beans.PropertyValue -args1(0).Name = "TableName" -args1(0).Value = "Tableau1" -args1(1).Name = "Columns" -args1(1).Value = incols -args1(2).Name = "Rows" -args1(2).Value = inrows -args1(3).Name = "Flags" -args1(3).Value = iflag -dispatcher.executeDispatch(document, ".uno:InsertTable", "", 0, args1()) - -If oDialogTableau.Model.CheckBox3.State = 1 or oDialogTableau.Model.CheckBox4.State = 1 Then - rem ---------------------------------------------------------------------- - dim args2(1) as new com.sun.star.beans.PropertyValue - args2(0).Name = "Count" - args2(0).Value = inrows - 1 - args2(1).Name = "Select" - args2(1).Value = true - dispatcher.executeDispatch(document, ".uno:GoDown", "", 0, args2()) - + rem define variables + dim document as object + dim dispatcher as object + dim inrows, incols,iflag as integer + rem ---------------------------------------------------------------------- + rem get access to the document + oDesktop = createUnoService("com.sun.star.frame.Desktop") + document= oDesktop.getCurrentComponent().getCurrentController() + dispatcher = createUnoService("com.sun.star.frame.DispatchHelper") rem ---------------------------------------------------------------------- - dim args3(1) as new com.sun.star.beans.PropertyValue - args3(0).Name = "Count" - args3(0).Value = incols - 1 - args3(1).Name = "Select" - args3(1).Value = true - dispatcher.executeDispatch(document, ".uno:GoRight", "", 0, args3()) - - If oDialogTableau.Model.CheckBox3.State = 1 Then - dim args4(0) as new com.sun.star.beans.PropertyValue - args4(0).Name = "CenterPara" - args4(0).Value = true - dispatcher.executeDispatch(document, ".uno:CenterPara", "", 0, args4()) - Endif - If oDialogTableau.Model.CheckBox4.State = 1 Then - dim args5(0) as new com.sun.star.beans.PropertyValue - args5(0).Name = "CellVertCenter" - args5(0).Value = true - dispatcher.executeDispatch(document, ".uno:CellVertCenter", "", 0, args5()) - Endif - dim args6(1) as new com.sun.star.beans.PropertyValue - args6(0).Name = "Count" - args6(0).Value = incols - 1 - args6(1).Name = "Select" - args6(1).Value = false - dispatcher.executeDispatch(document, ".uno:GoLeft", "", 0, args6()) - dim args7(1) as new com.sun.star.beans.PropertyValue - args7(0).Name = "Count" - args7(0).Value = inrows - 1 - args7(1).Name = "Select" - args7(1).Value = false - dispatcher.executeDispatch(document, ".uno:GoUp", "", 0, args7()) -Endif + inrows = Csng(oDialogTableau.Model.TextField1.Text) + incols = Csng(oDialogTableau.Model.TextField2.Text) + If oDialogTableau.Model.CheckBox1.State = 1 and oDialogTableau.Model.CheckBox2.State = 1 Then iflag = 15 + If oDialogTableau.Model.CheckBox1.State = 0 and oDialogTableau.Model.CheckBox2.State = 0 Then iflag = 8 + If oDialogTableau.Model.CheckBox1.State = 1 and oDialogTableau.Model.CheckBox2.State = 0 Then iflag = 14 + If oDialogTableau.Model.CheckBox1.State = 0 and oDialogTableau.Model.CheckBox2.State = 1 Then iflag = 9 + + dim args1(3) as new com.sun.star.beans.PropertyValue + args1(0).Name = "TableName" + args1(0).Value = "Tableau1" + args1(1).Name = "Columns" + args1(1).Value = incols + args1(2).Name = "Rows" + args1(2).Value = inrows + args1(3).Name = "Flags" + args1(3).Value = iflag + dispatcher.executeDispatch(document, ".uno:InsertTable", "", 0, args1()) + + If oDialogTableau.Model.CheckBox3.State = 1 or oDialogTableau.Model.CheckBox4.State = 1 Then + + rem ---------------------------------------------------------------------- + dim args2(1) as new com.sun.star.beans.PropertyValue + args2(0).Name = "Count" + args2(0).Value = inrows - 1 + args2(1).Name = "Select" + args2(1).Value = true + dispatcher.executeDispatch(document, ".uno:GoDown", "", 0, args2()) + + rem ---------------------------------------------------------------------- + dim args3(1) as new com.sun.star.beans.PropertyValue + args3(0).Name = "Count" + args3(0).Value = incols - 1 + args3(1).Name = "Select" + args3(1).Value = true + dispatcher.executeDispatch(document, ".uno:GoRight", "", 0, args3()) + + If oDialogTableau.Model.CheckBox3.State = 1 Then + dim args4(0) as new com.sun.star.beans.PropertyValue + args4(0).Name = "CenterPara" + args4(0).Value = true + dispatcher.executeDispatch(document, ".uno:CenterPara", "", 0, args4()) + Endif + If oDialogTableau.Model.CheckBox4.State = 1 Then + dim args5(0) as new com.sun.star.beans.PropertyValue + args5(0).Name = "CellVertCenter" + args5(0).Value = true + dispatcher.executeDispatch(document, ".uno:CellVertCenter", "", 0, args5()) + Endif + dim args6(1) as new com.sun.star.beans.PropertyValue + args6(0).Name = "Count" + args6(0).Value = incols - 1 + args6(1).Name = "Select" + args6(1).Value = false + dispatcher.executeDispatch(document, ".uno:GoLeft", "", 0, args6()) + dim args7(1) as new com.sun.star.beans.PropertyValue + args7(0).Name = "Count" + args7(0).Value = inrows - 1 + args7(1).Name = "Select" + args7(1).Value = false + dispatcher.executeDispatch(document, ".uno:GoUp", "", 0, args7()) + EndIf rem ------------------------------------------------------------------------- rem copie les donnees du tableau dans DMoptionstableau @@ -133,6 +133,6 @@ rem ------------------------------------------------------------------------------------------ -oDialogTableau.EndExecute() + oDialogTableau.EndExecute() End Sub \ No newline at end of file diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/TailleEquations.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/TailleEquations.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/TailleEquations.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/TailleEquations.xba 2017-05-21 19:20:44.000000000 +0000 @@ -505,7 +505,7 @@ EndIf ThisComponent.getcurrentcontroller().select(oWCurs) ' Gere le probleme du executeDispatch qui se fait parfois trop rapidement - On Error GoTo TraiteErreur + On Error GoTo TraiteErreurTE Wait 10 dim Array(0) as new com.sun.star.beans.PropertyValue oDispHelper.executeDispatch(oProvider, ".uno:InsertObjectStarMath", "", 0, Array()) @@ -515,7 +515,7 @@ oBugFormule.dispose oDispHelper.executeDispatch(oProvider, ".uno:Escape", "", 0, Array()) Exit Sub - TraiteErreur: + TraiteErreurTE: If err=423 Then wait 50 oDispHelper.executeDispatch(oProvider, ".uno:InsertObjectStarMath", "", 0, Array()) diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/TailleFormule.xdl dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/TailleFormule.xdl --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/TailleFormule.xdl 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/TailleFormule.xdl 2017-05-21 19:20:46.000000000 +0000 @@ -29,7 +29,7 @@ - + diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tools.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tools.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Tools.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Tools.xba 2017-05-21 19:20:44.000000000 +0000 @@ -28,7 +28,7 @@ Public Const listeCar = "Ç ü é â ä à å ç ê ë è ï î ì Ä Å É æ Æ ô ö ò û ù ÿ Ö Ü ø £ Ø × ƒ á í ó ú ñ Ñ ª º ¿ ® ¬ ½ ¼ ¡ « » Á  À © ¢ ¥ ã Ã Ê Ë È ı Í Î Ï Ì Ó ß Ô Ò õ Õ µ Ú Û Ù ý Ý § " Public Const CarUTF8 = "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«» ÁÂÀ© ¢¥ ãà ÊËÈıÍÎÏ ÃŒ ÓßÔÒõÕµ ÚÛÙýÝ §" -Public Const iNumVersionDmathsNew = 4300 rem ainsi que dans le fichier dmoptions.txt des options par défaut +Public Const iNumVersionDmathsNew = 4400 rem ainsi que dans le fichier dmoptions.txt des options par défaut Global MonDocumentImpress as Object Private sBoiteAppelante, ListPolices() As String rem la boîte appelante est la boîte de dialogue qui a appelé la macro, ListPolices contient la liste des polices. diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas_Tools.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas_Tools.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas_Tools.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas_Tools.xba 2017-05-21 19:20:44.000000000 +0000 @@ -214,8 +214,10 @@ Rem macro permettant de récupérer la liste des fonctions mémorisées ecrite le 19 janvier 2017 Rem le caractere & sert à délimiter les fonctions des variables Function RecupereFonctions As String + On Error GoTo TraiteErreurRecupereFonctions Dim sGiacVar, sMaVariable, sLigne as String Dim monTexte As Object, f2 As Object, flux As Object + Dim iNombreErreurs As Integer sGiacVar = sCheminDmathsUtilisateur & "giac.var" If FileExists(sGiacVar) Then monTexte = createUnoService("com.sun.star.io.TextInputStream") @@ -236,12 +238,20 @@ monTexte.closeInput Endif RecupereFonctions = sMaVariable + Exit Function + TraiteErreurRecupereFonctions: + iNombreErreurs = iNombreErreurs + 1 + If iNombreErreurs<=2 Then Call RapportBug.TraiteErreur("Xcas_Tools.CherchePositionFonction",Erl,Err,Error$) + Resume Next End Function Rem cette macro sert à remplir la listbox1 de oXcas contenant la liste des variables et fonctions mémorisées Sub RecupereVariables(oXcas As Object) + On Error GoTo TraiteErreurRecupereVariables + Dim sGiacVar, sMaVariable as String Dim monTexte As Object, f2 As Object, flux As Object + Dim iNombreErreurs As Integer sGiacVar = sCheminDmathsUtilisateur & "giac.var" If FileExists(sGiacVar) Then monTexte = createUnoService("com.sun.star.io.TextInputStream") @@ -257,35 +267,51 @@ flux.closeInput monTexte.closeInput oXcas.GetControl("ListBox1").selectItemPos(0,True) - Endif + Endif + Exit Sub + TraiteErreurRecupereVariables: + iNombreErreurs = iNombreErreurs + 1 + If iNombreErreurs <= 2 Then Call RapportBug.TraiteErreur("Xcas_Tools.CherchePositionFonction",Erl,Err,Error$) + Resume Next End Sub Rem cette fonction utilise dans TraiteChaineExportee complete Instr pour eviter l'imbrication des noms de fonctions ecrite le 21 janvier 2017 Function CherchePositionFonction(Optional iDebut as Integer,sMachaine As String,sNomFonction As String, FonctionsEtVariables) As Integer - Dim iPosRetour, iPosFU2, iPos1, iPos2 As Integer + On Error GoTo TraiteErreurCherchePositionFonction + + Dim iPosRetour, iPosFU2, iPos1, iPos2, iNombreErreurs As Integer If IsMissing(iDebut) Then iDebut = 1 - iPosRetour = Instr(iDebut,sMachaine,sNomFonction) -' Print "iposRetour ",iPosRetour - If iPosRetour > 0 Then - For J = LBound(FonctionsEtVariables) To UBound(FonctionsEtVariables) - If FonctionsEtVariables(J) <> sNomFonction Then - iPosFU2 = Instr(FonctionsEtVariables(J),sNomFonction) - If iPosFU2 > 0 Then - Do While iPosFU2 > 0 - iPos1 = iPosRetour - iPosFU2 + 1 - iPos2 = iPos1 + Len(FonctionsEtVariables(J)) - 1 - If iPos1 > 0 And iPos2 <= Len(sMachaine) Then - If Mid(sMachaine,iPos1,Len(FonctionsEtVariables(J))) = FonctionsEtVariables(J) Then - iPosRetour = 0 - Endif - Endif - iPosFU2 = Instr(iPosFU2+1,FonctionsEtVariables(J),sNomFonction) - Loop - End If - End If - Next J + If Len(sNomFonction) > 0 Then + iPosRetour = Instr(iDebut,sMachaine,sNomFonction) + ' Print "iposRetour ",iPosRetour + If iPosRetour > 0 Then + For J = LBound(FonctionsEtVariables) To UBound(FonctionsEtVariables) + If FonctionsEtVariables(J) <> sNomFonction Then + iPosFU2 = Instr(FonctionsEtVariables(J),sNomFonction) + If iPosFU2 > 0 Then + Do While iPosFU2 > 0 + iPos1 = iPosRetour - iPosFU2 + 1 + iPos2 = iPos1 + Len(FonctionsEtVariables(J)) - 1 + If iPos1 > 0 And iPos2 <= Len(sMachaine) Then + If Mid(sMachaine,iPos1,Len(FonctionsEtVariables(J))) = FonctionsEtVariables(J) Then + iPosRetour = 0 + Endif + Endif + iPosFU2 = Instr(iPosFU2+1,FonctionsEtVariables(J),sNomFonction) + Loop + End If + End If + Next J + EndIf + Else + iPosRetour = 0 Endif CherchePositionFonction = iPosRetour + Exit Function + TraiteErreurCherchePositionFonction: + iNombreErreurs = iNombreErreurs + 1 + If iNombreErreurs <= 2 Then Call RapportBug.TraiteErreur("Xcas_Tools.CherchePositionFonction",Erl,Err,Error$) + Resume Next End Function Rem cette fonction permet de determiner si la chaine sChaine est le nom d'une fonction connue (usuelle ou memeorisee) diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas.xba dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas.xba --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas.xba 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas.xba 2017-05-21 19:20:44.000000000 +0000 @@ -488,7 +488,7 @@ bIAuNumerateur = oXcas.getControl("IplaceAuNumerateur").State bDixMoinsNPres = oXcas.getControl("DixMoinsNPres").State bSysteme = oXcas.getControl("Systeme").State - bUseMemories = IIf(oXcas.getControl("Formel").State = 1,False,True) + bUseMemories = IIf(oXcas.getControl("Formel").State,False,True) bScientiNotation = oXcas.getControl("ScientiNotation").State bPuissancesCroissantes = oXcas.getControl("PuissancesCroissantes").State sPrecision = oXcas.getControl("NbreDecimales").Text @@ -497,7 +497,7 @@ oXcas.EndExecute bAjouteResultat = True sLastCalcul = oEvt.Source.Model.Name - If oEvt.Source.Context.getControl("Numeric").State = 1 And sLastCalcul = "solve" Then + If oEvt.Source.Context.getControl("Numeric").State And sLastCalcul = "solve" Then sLastCalcul = "f" & sLastCalcul Endif ExecuteCalcul (sLastCalcul) @@ -736,7 +736,7 @@ Dim iPosEgal as Integer Rem traitement de l'erreur -' On Error Goto ErreurSendFormula2Cas + On Error Goto ErreurSendFormula2Cas Rem pour une integrale avec ou sans détail bIntDetail2 = bIntDetail @@ -847,7 +847,7 @@ Rem on abandonne si Cas n'a pas su interpreter le calcul If sLaFormule = "undef" or sLaFormule = "normal()" Then - MsgBox ("Erreur : " & sLaFormule, 0 , "Dmaths Cas") + MsgBox ("Erreur : " & sLaFormule, 0 , "Dmaths Cas") Exit Sub Endif @@ -906,7 +906,8 @@ Function RunCas (sMaFormule as String, bAvecSortie as Boolean, bUtiliseMemoire as Boolean) as String Dim monTexte As Object, f2 As Object, flux As Object Dim sGiacIn, sGiacOut, sGiacSav, sFormulePasse as String - Dim iCompteurTemps as Integer + Dim iCompteurTemps, iNombreErreurs as Integer + Dim bRunUnderMac As Boolean On error goto TraitementErreurCas @@ -914,12 +915,21 @@ if bDebug Then Print sMaFormule," ", bAvecSortie + bRunUnderMac = IsMacOS + sFormulePasse = sMaFormule - sGiacIn = ConvertToUrl(sCheminDmathsUtilisateur & "giac.in") - sGiacOut = ConvertToUrl(sCheminDmathsUtilisateur & "giac.out") - sGiacSav = ConvertToUrl(sCheminDmathsUtilisateur & "giac.sav") - sGiacVar = ConvertToUrl(sCheminDmathsUtilisateur & "giac.var") + If bRunUnderMac Then + sGiacIn = sCheminDmathsUtilisateur & "giac.in" + sGiacOut = sCheminDmathsUtilisateur & "giac.out" + sGiacSav = sCheminDmathsUtilisateur & "giac.sav" + sGiacVar = sCheminDmathsUtilisateur & "giac.var" + Else + sGiacIn = ConvertToUrl(sCheminDmathsUtilisateur & "giac.in") + sGiacOut = ConvertToUrl(sCheminDmathsUtilisateur & "giac.out") + sGiacSav = ConvertToUrl(sCheminDmathsUtilisateur & "giac.sav") + sGiacVar = ConvertToUrl(sCheminDmathsUtilisateur & "giac.var") + Endif Rem supprssion de l'ancien fichier giac.in If FileExists(sGiacIn) Then Kill sGiacIn @@ -932,7 +942,7 @@ monTexte.Encoding = "utf-8" If bUtiliseMemoire Then - If IsMacOS Then + If bRunUnderMac Then monTexte.writeString("unarchive(""" & sGiacSav & """);" & Chr(10)) Else monTexte.writeString("unarchive(""giac.sav"");" & Chr(10)) @@ -950,7 +960,7 @@ Endif - If IsMacOS Then + If bRunUnderMac Then monTexte.writeString("Sortie:=fopen(""" & sGiacOut & """);" & Chr(10)) Else monTexte.writeString("Sortie:=fopen(""giac.out"");" & Chr(10)) @@ -966,18 +976,11 @@ If not bAvecSortie Then - If IsMacOS Then + If bRunUnderMac Then monTexte.writeString("Sortie:=fopen(""" & sGiacVar & """);" & Chr(10)) Else monTexte.writeString("Sortie:=fopen(""giac.var"");" & Chr(10)) Endif -' monTexte.writeString("for j in VARS do" & Chr(10)) -' monTexte.writeString(" si eval(j,1)!='Sortie' et eval(j,1)!='Resultat' alors" & Chr(10)) -' monTexte.writeString(" fprint(Sortie,Unquoted,""#"");" & Chr(10)) -' monTexte.writeString(" fprint(Sortie,Unquoted,eval(j,1));" & Chr(10)) -' monTexte.writeString(" fsi;" & Chr(10)) -' monTexte.writeString("od;" & Chr(10)) -' monTexte.writeString("fprint(Sortie,Unquoted,""\n"");" & Chr(10)) monTexte.writeString("for j in VARS do" & Chr(10)) monTexte.writeString(" si eval(j,1)!='Resultat' et eval(j,1)!='Sortie' et eval(j,1)!='j' alors" & Chr(10)) monTexte.writeString(" print(eval(j,1),type(j));" & Chr(10)) @@ -997,7 +1000,7 @@ Endif If bUtiliseMemoire Then - If IsMacOS Then + If bRunUnderMac Then monTexte.writeString("archive(""" & sGiacSav & """);" & Chr(10)) Else monTexte.writeString("archive(""giac.sav"");" & Chr(10)) @@ -1064,7 +1067,9 @@ Rem traitement des erreurs dans cette macro TraitementErreurCas: - MsgBox ("undef", 0 , "Dmaths Cas") + MsgBox ("undef", 0 , "Dmaths Cas") + iNombreErreurs = iNombreErreurs + 1 + If iNombreErreurs <= 2 Then Call RapportBug.TraiteErreur("Xcas.RunCas",Erl,Err,Error$) Exit Function End Function diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas.xdl dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas.xdl --- dmaths-4.3.0.0+dfsg1/dmaths/Dmaths/Xcas.xdl 2017-04-05 06:19:16.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Dmaths/Xcas.xdl 2017-05-21 19:20:44.000000000 +0000 @@ -109,7 +109,7 @@ - + diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/DmInstall/Install_Addon.xba dmaths-4.4.0.0+dfsg1/dmaths/DmInstall/Install_Addon.xba --- dmaths-4.3.0.0+dfsg1/dmaths/DmInstall/Install_Addon.xba 2017-04-05 06:19:18.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/DmInstall/Install_Addon.xba 2017-05-21 19:20:46.000000000 +0000 @@ -43,9 +43,9 @@ Public PI, PF As Integer rem sert à la configuration de la position des barres d'outils Public positionBarre as New com.sun.star.awt.Point rem sert à la configuration de la position des barres d'outils Public const sPositionDesBarresdOutilsParDefaut = "0,5:1070,0:0,4:821,4:950,0:16,1:72,1:16,2:14,1:" -Public const iVersion = " 4.3.0.0 " -Public const iNumVersionDmaths = 4300 rem à changer également dans Dmaths Tools ainsi que dans le fichier dmoptions.txt des options par défaut -Public const iNumVersionDmathsPlus = 4300 rem correspond à la version de DmathsPlus.dotm +Public const iVersion = " 4.4.0.0 " +Public const iNumVersionDmaths = 4400 rem à changer également dans Dmaths Tools ainsi que dans le fichier dmoptions.txt des options par défaut +Public const iNumVersionDmathsPlus = 4400 rem correspond à la version de DmathsPlus.dotm Rem permet la mise aux normes Dmaths Rem module6d.IntegreOOoAHmath3D à ajouter à la fin de la macro OOoAHmath3D.ahOutils.PosObjetFinal Rem module ChangerStylesAretes chargement de la boite aoDlg Style -> style pour fonctionnement sous Linux diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/DmInstall/Options.xba dmaths-4.4.0.0+dfsg1/dmaths/DmInstall/Options.xba --- dmaths-4.3.0.0+dfsg1/dmaths/DmInstall/Options.xba 2017-04-05 06:19:18.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/DmInstall/Options.xba 2017-05-21 19:20:46.000000000 +0000 @@ -545,20 +545,25 @@ Rem Cette macro transforme les raccourcis F10 en F8 et F9 en F4 ecrite le 17 octobre 2010 par Didier DP Sub Config4Mac(bForMac as Boolean) Dim oConfigAccess,MyProp as Object +' oConfigAccess = GetConfigAccess( "/org.openoffice.Office.Accelerators/PrimaryKeys/Global", True ) +' If oConfigAccess.hasByName("R_MOD1_MOD2") Then oConfigAccess.removeByName("R_MOD1_MOD2") oConfigAccess = GetConfigAccess( "/org.openoffice.Office.Accelerators/PrimaryKeys/Modules/com.sun.star.text.TextDocument", True ) If oConfigAccess.hasByName("X_MOD1") Then oConfigAccess.removeByName("X_MOD1") + If oConfigAccess.hasByName("X_MOD1_MOD2") Then oConfigAccess.removeByName("X_MOD1_MOD2") + If oConfigAccess.hasByName("R_MOD1_MOD2") Then oConfigAccess.removeByName("R_MOD1_MOD2") If oConfigAccess.hasByName("R_MOD1") Then oConfigAccess.removeByName("R_MOD1") If oConfigAccess.hasByName("F10_MOD2") Then oConfigAccess.removeByName("F10_MOD2") If oConfigAccess.hasByName("F3_MOD2") Then oConfigAccess.removeByName("F3_MOD2") If oConfigAccess.hasByName("F2_MOD2") Then oConfigAccess.removeByName("F2_MOD2") If oConfigAccess.hasByName("F5_MOD2") Then oConfigAccess.removeByName("F5_MOD2") + If oConfigAccess.hasByName("F7_MOD2") Then oConfigAccess.removeByName("F7_MOD2") If oConfigAccess.hasByName("F8_MOD2") Then oConfigAccess.removeByName("F8_MOD2") Rem lance la boite de calcul formel MyProp = oConfigAccess.CreateInstance If bForMac Then MyProp.Command = "vnd.sun.star.script:Dmaths.Xcas.ChargeDialogCalculFormel?language=Basic&location=application" - oConfigAccess.insertByName("X_MOD1",myProp) + oConfigAccess.insertByName("X_MOD1_MOD2",myProp) Endif Rem repete le calcul formel @@ -566,14 +571,21 @@ If bForMac Then MyProp.Command = "vnd.sun.star.script:Dmaths.Xcas.RappelDernierCalcul?language=Basic&location=application" Endif - oConfigAccess.insertByName("R_MOD1",myProp) + oConfigAccess.insertByName("R_MOD1_MOD2",myProp) Rem calcul formel simple MyProp = oConfigAccess.CreateInstance If bForMac Then MyProp.Command = "vnd.sun.star.script:Dmaths.Xcas.MetEnFormuleAndSendFormula2Cas?language=Basic&location=application" Endif - oConfigAccess.insertByName("F10_MOD2",myProp) + oConfigAccess.insertByName("F10_MOD2",myProp) + + Rem courriel de rapport de bug + MyProp = oConfigAccess.CreateInstance + If bForMac Then + MyProp.Command = "vnd.sun.star.script:Dmaths.RapportBug.EnvoieConfiguration?language=Basic&location=application" + Endif + oConfigAccess.insertByName("F7_MOD2",myProp) Rem MetEnMesureAlgebrique MyProp = oConfigAccess.CreateInstance Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/autotext/et/dmathset.bau and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/autotext/et/dmathset.bau differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/autotext/pt/dmathspt.bau and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/autotext/pt/dmathspt.bau differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_et.odt and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_et.odt differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_fr.odt and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_fr.odt differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_pt.odt and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/Faq/FAQ_pt.odt differ diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/Options/dmoptions.txt dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/Options/dmoptions.txt --- dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/Options/dmoptions.txt 2017-04-05 06:23:44.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/Options/dmoptions.txt 2017-05-21 19:20:24.000000000 +0000 @@ -1,6 +1,6 @@ iLang = 0 -iNumVersionDmathsCourante = 4300 -iNumVersionDmathsPlusCourante = 4300 +iNumVersionDmathsCourante = 4400 +iNumVersionDmathsPlusCourante = 4400 bItalic = TRUE bEdroit = TRUE bIdroit = TRUE Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/userguides/reglestypo/mathematiques.pdf and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/userguides/reglestypo/mathematiques.pdf differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/userguides/reglestypo/regles_typo_IGEN.pdf and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/userguides/reglestypo/regles_typo_IGEN.pdf differ Binary files /tmp/tmpc9UGaB/L_qhF5hjFu/dmaths-4.3.0.0+dfsg1/dmaths/Fichiers/userguides/user_guide_word.docx and /tmp/tmpc9UGaB/7sw1GqGh6T/dmaths-4.4.0.0+dfsg1/dmaths/Fichiers/userguides/user_guide_word.docx differ diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_de.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_de.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_de.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_de.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,11 +1,11 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -Die OOo-Extension Dmaths Version 4.3.0.0 +Die OOo-Extension Dmaths Version 4.4.0.0 Schließen Sie bitte LibreOffice/OpenOffice nach der Installation vollständig (einschließlich OOo-Schnellstarter) und starten es dann neu. Nach einem Update, schreiben Sie (in einem Textdokument) -irgendeine Formel, z.B. 1/2 und klicken Sie anschließend auf das rote "M". +irgendeine Formel, z.B. 2/5 und klicken Sie anschließend auf das rote "M". diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_en.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_en.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_en.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_en.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,12 +1,12 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -Le logiciel Dmaths version 4.3.0.0 +Le logiciel Dmaths version 4.4.0.0 After first installation, CLOSE and LAUNCH completely LO/AOO (quickstarter included). After update, then write a formula, -for example 1/2 then F10 (or F8). +for example 2/5 then F10 (or F8). diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_es.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_es.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_es.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_es.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,12 +1,12 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -Le logiciel Dmaths version 4.3.0.0 +Le logiciel Dmaths version 4.4.0.0 Después de la primer installación cierre y reinicie OpenOffice/LibreOffice/Neo (incluida la reiniciación rápida). Después de una actualización, -escriba una fórmula, por ejemplo 1/2 luego F10 (o F8). +escriba una fórmula, por ejemplo 2/5 luego F10 (o F8). diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_et.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_et.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_et.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_et.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,6 +1,6 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -Le logiciel Dmaths version 4.3.0.0 +Le logiciel Dmaths version 4.4.0.0 Translate to eesti keel @@ -9,6 +9,6 @@ After update, write a formula, -for example 1/2 then F10 (or F8). +for example 2/5 then F10 (or F8). diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_fr.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_fr.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_fr.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_fr.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,12 +1,12 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -Le logiciel Dmaths version 4.3.0.0 +Le logiciel Dmaths version 4.4.0.0 Après une première installation, FERMEZ et RELANCEZ complétement LO/AOOo (après avoir fermé le lanceur rapide). Après une mise à jour, -écrivez une formule 1/2 puis F10 (ou F8). +écrivez une formule 2/5 puis F10 (ou F8). diff -Nru dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_pt.txt dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_pt.txt --- dmaths-4.3.0.0+dfsg1/dmaths/pkg-desc/desc_pt.txt 2017-04-05 06:28:34.000000000 +0000 +++ dmaths-4.4.0.0+dfsg1/dmaths/pkg-desc/desc_pt.txt 2017-05-21 19:20:44.000000000 +0000 @@ -1,12 +1,12 @@ DmathsAddon Copyright Didier Dorange-Pattoret (c) 2001-2017 -O programa Dmaths versão 4.3.0.0 +O programa Dmaths versão 4.4.0.0 Depois de uma primeira instalação, FECHAR e INICIAR completamente o LibreOffice/OpenOffice (incluindo o iniciador rápido). Depois de uma atualização, -escrever uma fórmula, por exemplo 1/2 e F10 (ou F8). +escrever uma fórmula, por exemplo 2/5 e F10 (ou F8).