diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2022-06-22 18:10:36 +0200 |
|---|---|---|
| committer | Jean-Pierre Ledure <jp@ledure.be> | 2022-06-23 12:14:01 +0200 |
| commit | 30a6bf3960c37124c9c3cdbaec4794153e24c83a (patch) | |
| tree | c629cfcd789072560060697e476e27cb7698e66c | |
| parent | 69647b59544a072c78504e88af94c8ee1dd5de0a (diff) | |
ScriptForge - (SF_String) FIX Unquote() with "'" as quoting char
The quoting character (2nd argument of the method)
can be the single or the double quote.
The single quote was erroneously ignored.
Additionally comments are added in the code
about non-symmetrical escaping approaches:
"" or \'
(maybe to be added in help texts ?)
Commit to push to libreoffice-7-4 branch too.
Change-Id: Ifd8f66ee9e60310fdc292aa0f338e88d941b2e21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136292
Tested-by: Jean-Pierre Ledure <jp@ledure.be>
Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
Tested-by: Jenkins
| -rw-r--r-- | wizards/source/scriptforge/SF_String.xba | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wizards/source/scriptforge/SF_String.xba b/wizards/source/scriptforge/SF_String.xba index 10ce48045ab8..888cf672c5da 100644 --- a/wizards/source/scriptforge/SF_String.xba +++ b/wizards/source/scriptforge/SF_String.xba @@ -2539,6 +2539,9 @@ Public Function Unquote(Optional ByRef InputStr As Variant _ ) As String ''' Reset a quoted string to its original content ''' (used f.i. for parsing of csv-like records) +''' When the input string contains the quote character, the latter must be escaped: +''' - QuoteChar = double quote, by doubling it ("") +''' - QuoteChar = single quote, with a preceding backslash (\') ''' Args: ''' InputStr: the input string ''' QuoteChar: either " (default) or ' @@ -2567,7 +2570,7 @@ Check: End If Try: - If Left(InputStr, 1) <> """" Then ' No need to parse further + If Left(InputStr, 1) <> QuoteChar Then ' No need to parse further sUnquote = InputStr Else Set oCharacterClass = SF_Utils._GetUNOService("CharacterClass") |