diff options
author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-06-27 16:15:23 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-07-28 20:54:44 +0000 |
commit | 72e6f08c692c0625db5ce377fb478a99660adb0d (patch) | |
tree | a5db439b850782ed2245462361107522a9ed9b5a /sd/source | |
parent | 6dcd231892d80d2f130d1b9ebb9cf7dfa1115df1 (diff) |
GSoC Emoji Control
Tab Window
Add emoji.json to installation directory
Read the JSON data from code
Filter emojis according to categories
Insert Emoji at cursor position
Toolbar control
Change-Id: Ia5a577ce41398132872914ebfa499e4d4077d57e
Reviewed-on: https://gerrit.libreoffice.org/26700
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/app/sddll.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 6a2758308c43..c63d2b6abbec 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -91,6 +91,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> +#include <sfx2/emojipopup.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <vcl/FilterConfigItem.hxx> #include <comphelper/processfactory.hxx> @@ -238,6 +239,8 @@ void SdDLL::RegisterControllers(SdModule* pMod) SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); + + EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod ); } void SdDLL::Init() |