core.git: Branch 'libreoffice-24-2-5' - wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/sfdocuments/SF_Document.xba |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 647e35f54a9c41d6840bf191fcc97de56c6578a8
Author:     Jean-Pierre Ledure <j...@ledure.be>
AuthorDate: Mon Jul 8 16:04:04 2024 +0200
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jul 10 11:51:39 2024 +0200

    ScriptForge (Document) tdf#161946 Fix CreateMenu() / Before
    
    A too strict validity check of the Before argument
    prevents the use of numeric values.
    String values work fine.
    
    Fix the arguments of the call to SF_Utils.Validate()
    in SFDocuments.Document.xba
    
    Change-Id: Id1d21cef1c3f056078b0208a8e15c503e1ecb201
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170165
    Reviewed-by: Jean-Pierre Ledure <j...@ledure.be>
    Tested-by: Jenkins
    (cherry picked from commit b2b29283c21640d02b12c031963dbd50a646552c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170225
    (cherry picked from commit 42e3bb7cde89db579d5a42a18b7a7a93c6aad059)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170226
    (cherry picked from commit 161a6e1b2f946ee8f756874d240da738668ccbba)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170238
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/wizards/source/sfdocuments/SF_Document.xba 
b/wizards/source/sfdocuments/SF_Document.xba
index 6382b7c62827..43e143f30a59 100644
--- a/wizards/source/sfdocuments/SF_Document.xba
+++ b/wizards/source/sfdocuments/SF_Document.xba
@@ -572,7 +572,7 @@ Check:
        If ScriptForge.SF_Utils._EnterFunction(cstThisSub, cstSubArgs) Then
                If Not _IsStillAlive() Then GoTo Finally
                If Not ScriptForge.SF_Utils._Validate(MenuHeader, 
&quot;MenuHeader&quot;, V_STRING) Then GoTo Finally
-               If Not ScriptForge.SF_Utils._Validate(Before, 
&quot;Before&quot;, V_STRING) Then GoTo Finally
+               If Not ScriptForge.SF_Utils._Validate(Before, 
&quot;Before&quot;, Array(V_STRING, ScriptForge.V_NUMERIC)) Then GoTo Finally
                If Not ScriptForge.SF_Utils._Validate(SubmenuChar, 
&quot;SubmenuChar&quot;, V_STRING) Then GoTo Finally
        End If
 
@@ -2138,4 +2138,4 @@ Private Function _Repr() As String
 End Function   &apos;  SFDocuments.SF_Document._Repr
 
 REM ============================================ END OF SFDOCUMENTS.SF_DOCUMENT
-</script:module>
+</script:module>
\ No newline at end of file