[Libreoffice-commits] core.git: wizards/source

Jean-Pierre Ledure (via logerrit) logerrit at kemper.freedesktop.org
Mon Nov 16 15:05:35 UTC 2020


 wizards/source/sfdialogs/SF_Register.xba |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0d071acc0bd422e6d9af14cc7d7f35b6b3356478
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Mon Nov 16 15:59:43 2020 +0100
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Mon Nov 16 16:04:51 2020 +0100

    ScriptForge: (dialog) Better manage default values of service
    
    When an argument is absent in a varying list of
    arguments, it is not missing, it is EMPTY
    
    Change-Id: Ib46a692292886739e69f38a9a12c6ea4a9922a41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105948
    Tested-by: Jean-Pierre Ledure <jp at ledure.be>
    Reviewed-by: Jean-Pierre Ledure <jp at ledure.be>

diff --git a/wizards/source/sfdialogs/SF_Register.xba b/wizards/source/sfdialogs/SF_Register.xba
index e95966d835c6..a1a454c8f006 100644
--- a/wizards/source/sfdialogs/SF_Register.xba
+++ b/wizards/source/sfdialogs/SF_Register.xba
@@ -246,7 +246,8 @@ Check:
 	If IsMissing(pvArgs) Or IsEmpty(pvArgs) Then pvArgs = Array()
 	If Not IsArray(pvArgs) Then pvArgs = Array(pvArgs)		'	Needed when _NewDialog called from _EventManager
 	If UBound(pvArgs) >= 0 Then vContainer = pvArgs(0) Else vContainer = ""
-	If UBound(pvArgs) >= 1 Then vLibrary = pvArgs(1) Else vLibrary = "Standard"
+	If UBound(pvArgs) >= 1 Then vLibrary = pvArgs(1)
+	If IsEmpty(vLibrary) Then vLibrary = "Standard"
 	If UBound(pvArgs) >= 2 Then vDialogName = pvArgs(2) Else vDialogName = Empty	'	Use Empty to force mandatory status
 	If Not ScriptForge.SF_Utils._Validate(vContainer, "Container", Array(V_STRING, ScriptForge.V_OBJECT)) Then GoTo Finally
 	If Not ScriptForge.SF_Utils._Validate(vLibrary, "Library", V_STRING) Then GoTo Finally


More information about the Libreoffice-commits mailing list