sfx2/source/control/emojiview.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 1ce624ea8abd583eb8007c39669795e3ab808b35
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 16 13:33:53 2016 +0100
Related: tdf#101511 don't crash is emoji data is missing
Change-Id: I4209763671b1a84cd9d35e0c90f5f3dff05b23b8
diff --git a/sfx2/source/control/emojiview.cxx
b/sfx2/source/control/emojiview.cxx
index 177205d..c29ea75 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
