diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-08-16 13:33:53 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-16 13:34:19 +0100 |
commit | 1ce624ea8abd583eb8007c39669795e3ab808b35 (patch) | |
tree | c343d92e3185946398abb1ad3d104ab4ab3d0fcf | |
parent | 77235ac64be61afd707931675fec100c7c50d01c (diff) |
Related: tdf#101511 don't crash is emoji data is missing
Change-Id: I4209763671b1a84cd9d35e0c90f5f3dff05b23b8
-rw-r--r-- | sfx2/source/control/emojiview.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index 177205de5fce..c29ea7533dcd 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -95,8 +95,14 @@ EmojiView::~EmojiView() disposeOnce(); } -void EmojiView::Populate () +void EmojiView::Populate() { + if (msJSONData.empty()) + { + SAL_WARN("sfx", "Emoji config data is empty"); + return; + } + //TODO::populate view using the orcus json parser using node = orcus::json_document_tree::node; |