wizards/source/scriptforge/SF_Session.xba | 2 +- wizards/source/scriptforge/SF_String.xba | 4 ++-- wizards/source/scriptforge/script.xlb | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 1952c85f9ca8846e149016f54846342b74985ee8 Author: Jean-Pierre Ledure <[email protected]> AuthorDate: Mon Feb 2 13:58:09 2026 +0100 Commit: Jean-Pierre Ledure <[email protected]> CommitDate: Mon Feb 2 15:09:31 2026 +0100 ScriptForge fix tdf#169176 comma in file names Per https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file#file-and-directory-names the comma and the semicolon are not reserved characters in folder or file names. Not in Windows, and also not in Linux. The regular expressions used to filter valid file names have been reviewed accordingly in the ScriptForge.SF_String module. No impact on user scripts, except a better tolerance. No impact on user documentation. Change-Id: I4970c6d8334d717e5642782d3b5385731aa98717 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198545 Reviewed-by: Jean-Pierre Ledure <[email protected]> Tested-by: Jenkins diff --git a/wizards/source/scriptforge/SF_Session.xba b/wizards/source/scriptforge/SF_Session.xba index 95809e30c644..da8f7da7676b 100644 --- a/wizards/source/scriptforge/SF_Session.xba +++ b/wizards/source/scriptforge/SF_Session.xba @@ -1188,4 +1188,4 @@ CatchNotFound: End Function ' ScriptForge.SF_Session._GetScript REM =============================================== END OF SCRIPTFORGE.SF_SESSION -</script:module> +</script:module> \ No newline at end of file diff --git a/wizards/source/scriptforge/SF_String.xba b/wizards/source/scriptforge/SF_String.xba index 01205534fcb9..3342d1427aaa 100644 --- a/wizards/source/scriptforge/SF_String.xba +++ b/wizards/source/scriptforge/SF_String.xba @@ -60,8 +60,8 @@ Const REGEXTIMEMIN = "([0-5][0-9])" Const REGEXTIMESEC = REGEXTIMEMIN Const REGEXDIGITS = "^[0-9]+$" Const REGEXEMAIL = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$" -Const REGEXFILELINUX = "^[^<>:;,?""*|\]+$" -Const REGEXFILEWIN = "^([A-Z]|[a-z]:)?[^<>:;,?""*|]+$" +Const REGEXFILELINUX = "^[^<>:?""*|\]+$" +Const REGEXFILEWIN = "^([A-Z]|[a-z]:)?[^<>:?""*|]+$" Const REGEXHEXA = "^(0X|&H)?[0-9A-F]+$" ' Includes 0xFF and &HFF Const REGEXIPV4 = "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" Const REGEXNUMBER = "^[-+]?(([0-9]+)?\.)?[0-9]+([eE][-+]?[0-9]+)?$" diff --git a/wizards/source/scriptforge/script.xlb b/wizards/source/scriptforge/script.xlb index 0c1ae2408640..e4ac88f29e9e 100644 --- a/wizards/source/scriptforge/script.xlb +++ b/wizards/source/scriptforge/script.xlb @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> <library:library xmlns:library="http://openoffice.org/2000/library"; library:name="ScriptForge" library:readonly="false" library:passwordprotected="false"> + <library:element library:name="SF_Services"/> + <library:element library:name="SF_UI"/> + <library:element library:name="SF_Exception"/> + <library:element library:name="SF_Dictionary"/> + <library:element library:name="SF_Session"/> + <library:element library:name="_CodingConventions"/> <library:element library:name="_ModuleModel"/> <library:element library:name="SF_String"/> <library:element library:name="SF_Utils"/> @@ -8,17 +14,11 @@ <library:element library:name="SF_Array"/> <library:element library:name="SF_Platform"/> <library:element library:name="SF_PythonHelper"/> - <library:element library:name="SF_Timer"/> <library:element library:name="SF_FileSystem"/> + <library:element library:name="SF_Timer"/> <library:element library:name="SF_Region"/> <library:element library:name="SF_L10N"/> <library:element library:name="SF_SharedMemory"/> - <library:element library:name="__License"/> <library:element library:name="SF_Root"/> - <library:element library:name="_CodingConventions"/> - <library:element library:name="SF_Session"/> - <library:element library:name="SF_Dictionary"/> - <library:element library:name="SF_Exception"/> - <library:element library:name="SF_UI"/> - <library:element library:name="SF_Services"/> + <library:element library:name="__License"/> </library:library> \ No newline at end of file
