summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2020-12-25 12:55:49 -0400
committerMichael Meeks <michael.meeks@collabora.com>2021-04-10 15:49:31 +0100
commitde656ad6bdfd7d9493945610c22d08d8846fb0d2 (patch)
treedc349dc8520da86160e589cb3914359cbb983e1b /tools
parentc7846ae55d67307c1f0968ec362bc6256274caf3 (diff)
tools: json: fix missing escaped chars
When client side tries to show the "Macro Security Warning" message dialog, it fails to parse the JSON objects Change-Id: Id73c291ddd9cf739d63d69f06094eacb7b43a2f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108287 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/source/misc/json_writer.cxx21
1 files changed, 21 insertions, 0 deletions
diff --git a/tools/source/misc/json_writer.cxx b/tools/source/misc/json_writer.cxx
index e211d317b9ad..814f6180a85f 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -154,6 +154,27 @@ void JsonWriter::put(const char* pPropName, const OUString& rPropVal)
*mPos = static_cast<char>(ch);
++mPos;
}
+ else if (ch == '\n')
+ {
+ *mPos = '\\';
+ ++mPos;
+ *mPos = 'n';
+ ++mPos;
+ }
+ else if (ch == '\r')
+ {
+ *mPos = '\\';
+ ++mPos;
+ *mPos = 'r';
+ ++mPos;
+ }
+ else if (ch == '\f')
+ {
+ *mPos = '\\';
+ ++mPos;
+ *mPos = 'f';
+ ++mPos;
+ }
else if (ch <= 0x7F)
{
*mPos = static_cast<char>(ch);