diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-11-24 07:09:38 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-17 21:34:33 +0100 |
| commit | ee9164755ba3b661cb74741eea6b03d71d06cea6 (patch) | |
| tree | e72cbbe958ecf0cdfedd6cdca593a9145f5e1804 /desktop | |
| parent | c0634a1c8b99c586055f1ac2f7debb9080b6e3b4 (diff) | |
sw lok: notify repair when exist a conflict of multiple users undo/redo
Change-Id: I026f4df6239fa87ee191f92127f9fa98ac2993eb
Reviewed-on: https://gerrit.libreoffice.org/31161
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
(cherry picked from commit 2db42ab241d0852d89a470b18727c22d0fc06745)
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 1af96437fb0d..c2d1c82553d5 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -329,6 +329,11 @@ static boost::property_tree::ptree unoAnyToPropertyTree(const uno::Any& anyItem) if (aType == "string") aTree.put("value", anyItem.get<OUString>().toUtf8().getStr()); + else if (aType == "unsigned long") + aTree.put("value", OString::number(anyItem.get<sal_uInt32>()).getStr()); + else if (aType == "long") + aTree.put("value", OString::number(anyItem.get<sal_Int32>()).getStr()); + // TODO: Add more as required return aTree; @@ -1921,8 +1926,7 @@ public: aTree.put("success", bSuccess); } - // TODO UNO Any rEvent.Result -> JSON - // aTree.put("result": "..."); + aTree.add_child("result", unoAnyToPropertyTree(rEvent.Result)); std::stringstream aStream; boost::property_tree::write_json(aStream, aTree); |